Bug 1235866 - Port |Bug 1235676 - Add a topobjdir variable to all Makefiles| to c-c Thunderbird part. r=jcranmer

--HG--
extra : amend_source : 76d67fba88cdc633553c4606afdb40001a59f05d

mail/app/profile/extensions/Makefile.in

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DISTROEXT = $(abspath $(DIST))/bin/distribution/extensions
+DISTROEXT = $(ABS_DIST)/bin/distribution/extensions
 
 include $(topsrcdir)/config/rules.mk
 

mail/locales/Makefile.in

@@ -20,8 +20,8 @@ PWD := $(CURDIR)
 # pulls. You may override them if you provide your own files. You _must_
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
 # work in that case.
-ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
-WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
+WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@thunderbird.mozilla.org
@@ -32,9 +32,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning
 PP_TARGETS += L10N_PREF_JS_EXPORTS
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
-MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
-MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
+MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
+MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
+MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
@@ -42,8 +42,8 @@ ifeq (WINNT,$(OS_ARCH))
 UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
     $(NSINSTALL) -D $(STAGEDIST)/uninstall; \
     cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
-    $(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
-    cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
+    $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
+    cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
     $(NULL)
 endif
 
@@ -93,7 +93,7 @@ libs-%:
 # Note the funny extra '../' in SFX_HEADER is because the repackage-zip command
 # is actually run effectively from within the mozilla/ part of the objdir, so
 # topsrcdir points to the wrong place and we have to go one directory higher.
-repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
 	@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export

mail/testsuite-targets.mk

@@ -32,9 +32,9 @@ mozmill:
 	$(MOZMILLPYTHON) runtestlist.py --list=mozmilltests.list \
 	--binary=$(abspath $(BINARY)) \
 	--dir=$(abspath $(topsrcdir))/../mail/test/mozmill \
-	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
-	--plugins-path=$(abspath $(DIST)/plugins) \
-	--testing-modules-dir=$(abspath $(DEPTH)/_tests/modules) \
+	--symbols-path=$(ABS_DIST)/crashreporter-symbols \
+	--plugins-path=$(ABS_DIST)/plugins \
+	--testing-modules-dir=$(topobjdir)/_tests/modules \
 	$(MOZMILL_EXTRA)
 
 mozmill-one: solo-test = $(find-solo-test)
@@ -43,9 +43,9 @@ mozmill-one:
 	$(MOZMILLPYTHON) runtest.py \
 	--test=$(abspath $(topsrcdir))/../mail/test/mozmill/$(solo-test) \
 	--binary=$(abspath $(BINARY)) \
-	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
-	--plugins-path=$(abspath $(DIST)/plugins) \
-	--testing-modules-dir=$(abspath $(DEPTH)/_tests/modules) \
+	--symbols-path=$(ABS_DIST)/crashreporter-symbols \
+	--plugins-path=$(ABS_DIST)/plugins \
+	--testing-modules-dir=$(topobjdir)/_tests/modules \
 	$(MOZMILL_EXTRA)
 
 # We need to add the mozmill tests to the package for tests.