summaryrefslogtreecommitdiff
path: root/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-12-31 17:22:18 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-12-31 17:22:18 -0500
commitff9c5077503b3a9b22be57b073d1d77bb959bb04 (patch)
tree5a23ab0d1261bfb41fc7fef0cb3248963435dacc /mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
parentc7939f2babc29899c41dfbad83b967b8f832ee85 (diff)
fix firefox-install-dir.patch for iceweasel-libre
Apparently debian patched config/autoconf.mk.in to have installdir use $(MOZ_APP_BASE_VERSION) instead of $(MOZ_APP_VERSION). This is what Firefox did at least through version 7, and is something I would normally agree with, but it breaks firefox-install-dir.patch.
Diffstat (limited to 'mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch')
-rw-r--r--mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
new file mode 100644
index 000000000..f80a3eca9
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in
+--- iceweasel-9.0.1.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500
++++ iceweasel-9.0.1/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500
+@@ -68,8 +68,8 @@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in
+--- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500
++++ iceweasel-9.0.1/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500
+@@ -60,8 +60,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)))