diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-09 17:00:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-09 17:00:33 -0500 |
| commit | bf7b1c01ce324e441d85d9706dfca6208c824f9d (patch) | |
| tree | e856afb7f1f6dd2c3c50b4c1a71400ae2a29aca4 /libre/icecat/icecat-install-dir.patch | |
| parent | 918b51b44f8d1a299f7f0fbce1f58491804c9f80 (diff) | |
| parent | a16a7fa77c16e8e6c5abcdca28a2970f77ea8650 (diff) | |
| download | abslibre-bf7b1c01ce324e441d85d9706dfca6208c824f9d.tar.gz abslibre-bf7b1c01ce324e441d85d9706dfca6208c824f9d.tar.bz2 abslibre-bf7b1c01ce324e441d85d9706dfca6208c824f9d.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/icecat/icecat-install-dir.patch')
| -rw-r--r--[-rwxr-xr-x] | libre/icecat/icecat-install-dir.patch | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch index eb698f307..7a72b9c9d 100755..100644 --- a/libre/icecat/icecat-install-dir.patch +++ b/libre/icecat/icecat-install-dir.patch @@ -1,27 +1,30 @@ ---- a/config/autoconf.mk.in -+++ b/config/autoconf.mk.in -@@ -74,8 +74,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk +--- a/config/baseconfig.mk ++++ b/config/baseconfig.mk +@@ -1,9 +1,9 @@ + 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 +-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 - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in ---- a/js/src/config/autoconf.mk.in -+++ b/js/src/config/autoconf.mk.in -@@ -60,8 +60,8 @@ - datadir = @datadir@ - mandir = @mandir@ + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk +--- a/js/src/config/baseconfig.mk ++++ b/js/src/config/baseconfig.mk +@@ -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 +-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))) + DIST = $(TOP_DIST) |