summaryrefslogtreecommitdiff
path: root/mozilla-testing/icecat/firefox-install-dir.patch
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-03 11:39:36 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-03 11:39:36 -0300
commitca2e05bb7791418f2af678704160d56d8184a21a (patch)
tree48a6f85c00b3ed2362cc4d9c9d7f5230bb854eba /mozilla-testing/icecat/firefox-install-dir.patch
parent45675ec8babcd9ea73f6a49f51f6e7da9d1f1592 (diff)
parent48c96871761a4aad193d814e87ddb87c322e17d2 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/libgda3/PKGBUILD community/intel-tbb/PKGBUILD community/mtpaint/PKGBUILD extra/cmake/PKGBUILD extra/graphicsmagick/PKGBUILD extra/kdeadmin/PKGBUILD extra/kdelibs/PKGBUILD extra/lyx/PKGBUILD extra/qtscriptgenerator/PKGBUILD kde-unstable/kdeadmin/PKGBUILD kde-unstable/kdelibs/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD libre/libretools/PKGBUILD libre/p7zip-libre/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/wine/PKGBUILD testing/glibc/PKGBUILD
Diffstat (limited to 'mozilla-testing/icecat/firefox-install-dir.patch')
-rw-r--r--mozilla-testing/icecat/firefox-install-dir.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/mozilla-testing/icecat/firefox-install-dir.patch b/mozilla-testing/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/mozilla-testing/icecat/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)))