summaryrefslogtreecommitdiff
path: root/libre/iceweasel/iceweasel-install-dir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/iceweasel/iceweasel-install-dir.patch')
-rw-r--r--libre/iceweasel/iceweasel-install-dir.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/libre/iceweasel/iceweasel-install-dir.patch b/libre/iceweasel/iceweasel-install-dir.patch
index af113fa85..d4fb24e06 100644
--- a/libre/iceweasel/iceweasel-install-dir.patch
+++ b/libre/iceweasel/iceweasel-install-dir.patch
@@ -1,13 +1,11 @@
-diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index 7ca8e35..6e92846 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
-@@ -5,7 +5,7 @@
- MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+@@ -4,7 +4,7 @@
+ # whether a normal build is happening or whether the check is running.
+ 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)
+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
- ifndef TOP_DIST
- TOP_DIST = dist
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ ifeq (.,$(DEPTH))
+ DIST = dist