summaryrefslogtreecommitdiff
path: root/libre-testing/icecat/firefox-install-dir.patch
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@parabola.nu>2013-01-16 14:55:14 -0300
committerNicolás Reynolds <fauno@parabola.nu>2013-01-16 14:55:14 -0300
commit937c8656ecd59d9800c7d6dfb23a816195320bdd (patch)
tree98a52492045c0b59661676ee6289a9419b8a2072 /libre-testing/icecat/firefox-install-dir.patch
parent4446f2330756577653fd2ebbaf1bef6950720fde (diff)
parentf62179b3bfcd584fa856098cbddb39614b9f8a60 (diff)
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre-testing/icecat/firefox-install-dir.patch')
-rw-r--r--libre-testing/icecat/firefox-install-dir.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/libre-testing/icecat/firefox-install-dir.patch b/libre-testing/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..9c115f0eb
--- /dev/null
+++ b/libre-testing/icecat/firefox-install-dir.patch
@@ -0,0 +1,30 @@
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-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)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++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-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-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)