summaryrefslogtreecommitdiff
path: root/www/libxul/files/patch-config-baseconfig.mk
diff options
context:
space:
mode:
Diffstat (limited to 'www/libxul/files/patch-config-baseconfig.mk')
-rw-r--r--www/libxul/files/patch-config-baseconfig.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/www/libxul/files/patch-config-baseconfig.mk b/www/libxul/files/patch-config-baseconfig.mk
index e6fd78f35e7b..9db69516cbcc 100644
--- a/www/libxul/files/patch-config-baseconfig.mk
+++ b/www/libxul/files/patch-config-baseconfig.mk
@@ -1,8 +1,6 @@
--- config/baseconfig.mk~
+++ config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
-
+@@ -1,7 +1,7 @@
-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)
@@ -11,6 +9,6 @@
+idldir = $(datadir)/idl/%%MOZILLA%%
+installdir = $(libdir)/%%MOZILLA%%
+sdkdir = $(libdir)/%%MOZILLA%%
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif