diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
| commit | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (patch) | |
| tree | 34cccc67370ca8d178c21556bc6c6a894bef1f84 /libre/icecat/firefox-install-dir.patch | |
| parent | 3a5380856fae97f3358dc00522656c9f1fc26187 (diff) | |
| parent | dc26483bfd644bb2ad6dd25e3bb5ca9e2bbe1099 (diff) | |
| download | abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.gz abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.bz2 abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.zip | |
Merge branch 'wip-merge'
Conflicts:
libre/dpkg/PKGBUILD
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
Diffstat (limited to 'libre/icecat/firefox-install-dir.patch')
| -rw-r--r-- | libre/icecat/firefox-install-dir.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch new file mode 100644 index 000000000..9c115f0eb --- /dev/null +++ b/libre/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) |