2014-07-23 15:54:33 +00:00
|
|
|
--- config/baseconfig.mk.orig 2014-07-23 17:41:26.898090299 +0200
|
|
|
|
|
+++ config/baseconfig.mk 2014-07-23 17:43:06.407093842 +0200
|
|
|
|
|
@@ -1,7 +1,7 @@
|
2012-12-17 11:32:21 +00:00
|
|
|
-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
|
|
|
|
|
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
|
|
|
|
|
MOZDEPTH = $(DEPTH)/mozilla
|
|
|
|
|
DIST = $(MOZDEPTH)/dist
|
2014-07-23 15:54:33 +00:00
|
|
|
--- mozilla/config/baseconfig.mk.orig 2014-07-23 17:41:26.899090299 +0200
|
|
|
|
|
+++ mozilla/config/baseconfig.mk 2014-07-23 17:44:37.283097079 +0200
|
|
|
|
|
@@ -2,10 +2,10 @@
|
|
|
|
|
# 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-12-17 11:32:21 +00:00
|
|
|
-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
|
2014-07-23 15:54:33 +00:00
|
|
|
ifndef TOP_DIST
|
|
|
|
|
TOP_DIST = dist
|
|
|
|
|
endif
|
