summaryrefslogtreecommitdiff
path: root/libre/iceweasel-libre/iceweasel-install-dir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/iceweasel-libre/iceweasel-install-dir.patch')
-rw-r--r--libre/iceweasel-libre/iceweasel-install-dir.patch22
1 files changed, 10 insertions, 12 deletions
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
index a44aef496..3938c0b3e 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,9 +1,8 @@
-diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
---- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200
-+++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200
-@@ -1,10 +1,10 @@
- INCLUDED_AUTOCONF_MK = 1
-
+diff --git a/config/baseconfig.mk b/config/baseconfig.mk
+index 9c70e24..eff0fd2 100644
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,8 +1,8 @@
MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
@@ -16,12 +15,11 @@ diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/bas
DIST = $(DEPTH)/dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200
-+++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
-
+diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
+index 1ff076c..5386569 100644
+--- a/js/src/config/baseconfig.mk
++++ b/js/src/config/baseconfig.mk
+@@ -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)