2012-11-20 22:23:42 +01:00
|
|
|
diff --git a/config/baseconfig.mk b/config/baseconfig.mk
|
|
|
|
--- a/config/baseconfig.mk
|
|
|
|
+++ b/config/baseconfig.mk
|
2016-04-30 15:53:52 +02:00
|
|
|
@@ -1,16 +1,16 @@
|
2015-06-21 13:26:59 +02:00
|
|
|
# This file is normally included by autoconf.mk, but it is also used
|
|
|
|
# directly in python/mozbuild/mozbuild/base.py for gmake validation.
|
|
|
|
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
|
|
|
|
# whether a normal build is happening or whether the check is running.
|
2012-11-20 22:23:42 +01:00
|
|
|
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
|
|
|
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
2016-04-30 15:53:52 +02:00
|
|
|
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
|
|
|
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
2012-11-20 22:23:42 +01:00
|
|
|
+includedir := $(includedir)/$(MOZ_APP_NAME)
|
|
|
|
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
|
2016-04-30 15:53:52 +02:00
|
|
|
+installdir = $(libdir)/$(MOZ_APP_NAME)
|
|
|
|
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
|
|
|
|
ifeq (.,$(DEPTH))
|
|
|
|
DIST = dist
|
2015-06-21 13:26:59 +02:00
|
|
|
else
|
2016-04-30 15:53:52 +02:00
|
|
|
DIST = $(DEPTH)/dist
|
|
|
|
endif
|
2017-03-18 22:27:55 +01:00
|
|
|
ABS_DIST = $(topobjdir)/dist
|
2016-04-30 15:53:52 +02:00
|
|
|
|
|
|
|
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
|