X-Git-Url: http://gitweb/?a=blobdiff_plain;f=firefox%2Ffirefox-install-dir.patch;h=7f753bdbeeac69162aa4df7b9aec6d7c95ff7856;hb=6bb9f2626cfd53b253d679f6b8522da103642cef;hp=24290f8ffa709223d4a8593b91069137e0b6fef7;hpb=c1fcc87213cb3a4f1d218e342417c50ea4f01183;p=ports%2Fopt-arm.git

diff --git a/firefox/firefox-install-dir.patch b/firefox/firefox-install-dir.patch
index 24290f8..7f753bd 100644
--- a/firefox/firefox-install-dir.patch
+++ b/firefox/firefox-install-dir.patch
@@ -1,7 +1,10 @@
-diff -Nur mozilla-beta.orig/config/baseconfig.mk mozilla-beta/config/baseconfig.mk
---- mozilla-beta.orig/config/baseconfig.mk  2014-01-14 20:37:43.142280922 +0100
-+++ mozilla-beta/config/baseconfig.mk 2014-01-14 20:38:40.184259453 +0100
-@@ -1,7 +1,7 @@
+diff -rupN firefox-45.0b2.orig/config/baseconfig.mk firefox-45.0b2/config/baseconfig.mk
+--- firefox-45.0b2.orig/config/baseconfig.mk	2016-02-02 18:20:35.472808496 +0100
++++ firefox-45.0b2/config/baseconfig.mk	2016-02-02 18:22:04.606017747 +0100
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
 -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -10,18 +13,7 @@ diff -Nur mozilla-beta.orig/config/baseconfig.mk mozilla-beta/config/baseconfig.
 +idldir = $(datadir)/idl/$(MOZ_APP_NAME)
 +installdir = $(libdir)/$(MOZ_APP_NAME)
 +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur mozilla-beta.orig/js/src/config/baseconfig.mk mozilla-beta/js/src/config/baseconfig.mk
---- mozilla-beta.orig/js/src/config/baseconfig.mk 2014-01-14 20:37:43.732301391 +0100
-+++ mozilla-beta/js/src/config/baseconfig.mk  2014-01-14 20:39:12.769389327 +0100
-@@ -1,5 +1,5 @@
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else