summaryrefslogtreecommitdiff
path: root/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-12-30 04:53:17 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-12-30 04:53:17 -0500
commitc7939f2babc29899c41dfbad83b967b8f832ee85 (patch)
tree5f129d926312b37ea84bd4c41bdb3329c4cad504 /mozilla-testing/iceweasel-libre/firefox-install-dir.patch
parent6ca4fa12622a93820fa919667de8eb51c9188181 (diff)
downloadabslibre-c7939f2babc29899c41dfbad83b967b8f832ee85.tar.gz
abslibre-c7939f2babc29899c41dfbad83b967b8f832ee85.tar.bz2
abslibre-c7939f2babc29899c41dfbad83b967b8f832ee85.zip
Pull in changes from Arch Firefox to our Iceweasel
Diffstat (limited to 'mozilla-testing/iceweasel-libre/firefox-install-dir.patch')
-rw-r--r--mozilla-testing/iceweasel-libre/firefox-install-dir.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/mozilla-testing/iceweasel-libre/firefox-install-dir.patch b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-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
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir = @datadir@
+ mandir = @mandir@
+
+-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
+
+ TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))