Bug 924992 - Use an absolute path for DIST; r=gps
☠☠ backed out by 500765bd8dd9 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 10 Oct 2013 18:00:44 +0900
changeset 158995 cff5a22acb7c81cf373a85a3de08c480999ed550
parent 158994 701758a4010d500fe5d395118db513548db5c79b
child 158996 2390cb215cc4d7707110e9ee0f4b6ebc092abe57
push id4537
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 22:18:47 +0000
treeherdermozilla-aurora@60c6fd67470e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs924992
milestone27.0a1
Bug 924992 - Use an absolute path for DIST; r=gps
config/baseconfig.mk
config/config.mk
js/src/config/baseconfig.mk
js/src/config/config.mk
security/build/Makefile.in
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,13 +1,18 @@
 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)
-DIST = $(DEPTH)/dist
+
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
+
+DIST := $(call core_realpath,$(DEPTH)/dist)
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
 # We only want to do the pymake sanity on Windows, other os's can cope
 ifeq ($(HOST_OS_ARCH),WINNT)
--- a/config/config.mk
+++ b/config/config.mk
@@ -59,20 +59,16 @@ CHECK_VARS := \
  $(NULL)
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
-ifndef INCLUDED_FUNCTIONS_MK
-include $(topsrcdir)/config/makefiles/functions.mk
-endif
-
 RM = rm -f
 
 # LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.
 LIBXUL_DIST ?= $(DIST)
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).
 #
--- a/js/src/config/baseconfig.mk
+++ b/js/src/config/baseconfig.mk
@@ -1,18 +1,22 @@
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
+
 ifneq (,$(filter /%,$(TOP_DIST)))
-DIST = $(TOP_DIST)
+DIST := $(call core_realpath,$(TOP_DIST))
 else
 ifeq (.,$(DEPTH))
-DIST = $(TOP_DIST)
+DIST := $(call core_realpath,$(TOP_DIST))
 else
-DIST = $(DEPTH)/$(TOP_DIST)
+DIST := $(call core_realpath,$(DEPTH)/$(TOP_DIST))
 endif
 endif
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -59,20 +59,16 @@ CHECK_VARS := \
  $(NULL)
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
-ifndef INCLUDED_FUNCTIONS_MK
-include $(topsrcdir)/config/makefiles/functions.mk
-endif
-
 RM = rm -f
 
 # LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.
 LIBXUL_DIST ?= $(DIST)
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).
 #
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -7,18 +7,16 @@ CC_WRAPPER =
 CXX_WRAPPER =
 
 ifdef MOZ_FOLD_LIBS
 FORCE_SHARED_LIB = 1
 endif
 
 default::
 
-include $(topsrcdir)/config/makefiles/functions.mk
-
 NSS_LIBS = \
   nss3 \
   nssutil3 \
   smime3 \
   ssl3 \
   $(NULL)
 
 ifdef MOZ_FOLD_LIBS