No Issue - Use MOZILLA_DIR in client.mk and remove config/makefiles.

1 files changed, 23 insertions, 22 deletions

diff --git a/client.mk b/client.mk
index e89bbe6..4c23a7a 100644
--- a/client.mk
+++ b/client.mk
@@ -46,7 +46,6 @@ endef
 endif
 endif
 
-
 CWD := $(CURDIR)
 ifneq (1,$(words $(CWD)))
 $(error The platform directory cannot be located in a path with spaces.)
@@ -64,11 +63,13 @@ TOPSRCDIR := $(CWD)
 endif
 endif
 
+MOZILLA_DIR=$(TOPSRCDIR)/platform
+
 SH := /bin/sh
 PERL ?= perl
 PYTHON ?= $(shell which python2.7 > /dev/null 2>&1 && echo python2.7 || echo python)
 
-CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/platform/build/autoconf/config.guess)
+CONFIG_GUESS_SCRIPT := $(wildcard $(MOZILLA_DIR)/build/autoconf/config.guess)
 ifdef CONFIG_GUESS_SCRIPT
   CONFIG_GUESS := $(shell $(CONFIG_GUESS_SCRIPT))
 endif
@@ -150,8 +151,8 @@ MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
 
 # 'configure' scripts generated by autoconf.
 CONFIGURES := $(TOPSRCDIR)/configure
-CONFIGURES += $(TOPSRCDIR)/platform/configure
-CONFIGURES += $(TOPSRCDIR)/platform/js/src/configure
+CONFIGURES += $(MOZILLA_DIR)/configure
+CONFIGURES += $(MOZILLA_DIR)/js/src/configure
 
 # Make targets that are going to be passed to the real build system
 OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check automation/build
@@ -164,8 +165,8 @@ build::
 	$(MAKE) -f $(TOPSRCDIR)/client.mk $(if $(MOZ_PGO),profiledbuild,realbuild) CREATE_MOZCONFIG_JSON=
 
 # Define mkdir
-include $(TOPSRCDIR)/config/makefiles/makeutils.mk
-include $(TOPSRCDIR)/config/makefiles/autotargets.mk
+include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
+include $(MOZILLA_DIR)/config/makefiles/autotargets.mk
 
 # Create a makefile containing the mk_add_options values from mozconfig,
 # but only do so when OBJDIR is defined (see further above).
@@ -242,7 +243,7 @@ profiledbuild::
 ifdef MOZ_UNIFY_BDATE
 ifndef MOZ_BUILD_DATE
 ifdef MOZ_BUILD_PROJECTS
-MOZ_BUILD_DATE = $(shell $(PYTHON) $(TOPSRCDIR)/platform/build/variables.py buildid_header | awk '{print $$3}')
+MOZ_BUILD_DATE = $(shell $(PYTHON) $(MOZILLA_DIR)/build/variables.py buildid_header | awk '{print $$3}')
 export MOZ_BUILD_DATE
 endif
 endif
@@ -295,11 +296,11 @@ CONFIG_CACHE  = $(wildcard $(OBJDIR)/config.cache)
 
 EXTRA_CONFIG_DEPS := \
   $(TOPSRCDIR)/aclocal.m4 \
-  $(TOPSRCDIR)/platform/aclocal.m4 \
-  $(TOPSRCDIR)/platform/old-configure.in \
-  $(wildcard $(TOPSRCDIR)/platform/build/autoconf/*.m4) \
-  $(TOPSRCDIR)/platform/js/src/aclocal.m4 \
-  $(TOPSRCDIR)/platform/js/src/old-configure.in \
+  $(MOZILLA_DIR)/aclocal.m4 \
+  $(MOZILLA_DIR)/old-configure.in \
+  $(wildcard $(MOZILLA_DIR)/build/autoconf/*.m4) \
+  $(MOZILLA_DIR)/js/src/aclocal.m4 \
+  $(MOZILLA_DIR)/js/src/old-configure.in \
   $(NULL)
 
 $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
@@ -308,15 +309,15 @@ $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
 	chmod +x $@
 
 CONFIG_STATUS_DEPS := \
-  $(wildcard $(TOPSRCDIR)/platform/ldap/sdks/c-sdk/configure) \
+  $(wildcard $(MOZILLA_DIR)/ldap/sdks/c-sdk/configure) \
   $(wildcard $(TOPSRCDIR)/*/confvars.sh) \
   $(CONFIGURES) \
-  $(TOPSRCDIR)/platform/CLOBBER \
-  $(TOPSRCDIR)/platform/nsprpub/configure \
-  $(TOPSRCDIR)/platform/config/milestone.txt \
-  $(TOPSRCDIR)/platform/build/virtualenv_packages.txt \
-  $(TOPSRCDIR)/platform/python/mozbuild/mozbuild/virtualenv.py \
-  $(TOPSRCDIR)/platform/testing/mozbase/packages.txt \
+  $(MOZILLA_DIR)/CLOBBER \
+  $(MOZILLA_DIR)/nsprpub/configure \
+  $(MOZILLA_DIR)/config/milestone.txt \
+  $(MOZILLA_DIR)/build/virtualenv_packages.txt \
+  $(MOZILLA_DIR)/python/mozbuild/mozbuild/virtualenv.py \
+  $(MOZILLA_DIR)/testing/mozbase/packages.txt \
   $(OBJDIR)/.mozconfig.json \
   $(NULL)
 
@@ -333,9 +334,9 @@ else
   CONFIGURE = $(TOPSRCDIR)/configure
 endif
 
-$(OBJDIR)/CLOBBER: $(TOPSRCDIR)/platform/CLOBBER
-	$(PYTHON) $(TOPSRCDIR)/platform/config/pythonpath.py -I $(TOPSRCDIR)/platform/testing/mozbase/mozfile \
-	    $(TOPSRCDIR)/platform/python/mozbuild/mozbuild/controller/clobber.py $(TOPSRCDIR)/platform $(OBJDIR)
+$(OBJDIR)/CLOBBER: $(MOZILLA_DIR)/CLOBBER
+	$(PYTHON) $(MOZILLA_DIR)/config/pythonpath.py -I $(MOZILLA_DIR)/testing/mozbase/mozfile \
+	    $(MOZILLA_DIR)/python/mozbuild/mozbuild/controller/clobber.py $(MOZILLA_DIR) $(OBJDIR)
 
 configure-files: $(CONFIGURES)