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

--HG--
extra : amend_source : dede0df278294bdf3244348cd86e81b56d86f99b

calendar/lightning/lightning-packager.mk

@@ -30,9 +30,8 @@ else
 UNIVERSAL_PATH=
 endif
 
-_ABS_DIST := $(abspath $(DIST))
 XPI_STAGE_PATH = $(DIST)/$(UNIVERSAL_PATH)xpi-stage
-_ABS_XPI_STAGE_PATH = $(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage
+_ABS_XPI_STAGE_PATH = $(ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage
 ENUS_PKGNAME=$(subst .$(AB_CD).,.en-US.,$(XPI_PKGNAME))
 XPI_ZIP_IN=$(_ABS_XPI_STAGE_PATH)/$(ENUS_PKGNAME).xpi
 
@@ -153,9 +152,9 @@ repack-stage:
 libs-%: FINAL_XPI_NAME=$(if $(L10N_XPI_NAME),$(L10N_XPI_NAME),$(XPI_NAME))
 libs-%: FINAL_XPI_PKGNAME=$(if $(L10N_XPI_PKGNAME),$(L10N_XPI_PKGNAME),$(XPI_PKGNAME))
 libs-%:
-	$(MAKE) -C locales libs AB_CD=$* FINAL_TARGET=$(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
+	$(MAKE) -C locales libs AB_CD=$* FINAL_TARGET=$(ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
 	  XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_PKGNAME) USE_EXTENSION_MANIFEST=1
-	$(MAKE) -C locales tools AB_CD=$* FINAL_TARGET=$(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
+	$(MAKE) -C locales tools AB_CD=$* FINAL_TARGET=$(ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
 	  XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_PKGNAME) USE_EXTENSION_MANIFEST=1
 
 # The calling makefile might need to process some extra files. Provide an empty

calendar/test/mozmill/Makefile.in

@@ -16,10 +16,10 @@ APP_NAME = $(MOZ_APP_DISPLAYNAME)
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
 endif
-MOZMILLPROGRAM = $(abspath $(DIST)/$(APP_NAME).app/)
+MOZMILLPROGRAM = $(ABS_DIST)/$(APP_NAME).app/
 else
 # Non-mac options
-MOZMILLPROGRAM = $(abspath $(DIST)/bin/thunderbird$(BIN_SUFFIX))
+MOZMILLPROGRAM = $(ABS_DIST)/bin/thunderbird$(BIN_SUFFIX)
 endif
 
 check-no-solo = $(foreach solo,SOLO_TEST SOLO_FILE,$(if $($(solo)),$(error $(subst SOLOVAR,$(solo),$(1)))))
@@ -46,8 +46,8 @@ mozmill: mozmill-stage
 	$(MOZMILLPYTHON) runtestlist.py --list=$(srcdir)/mozmilltests.list \
 	--binary=$(MOZMILLPROGRAM) \
 	--dir=$(abspath $(MOZMILLDIR))/stage \
-	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
-	--plugins-path=$(abspath $(DIST)/plugins) \
+	--symbols-path=$(ABS_DIST)/crashreporter-symbols \
+	--plugins-path=$(ABS_DIST)/plugins \
 	$(MOZMILL_EXTRA)
 
 mozmill-one: solo-test = $(find-solo-test)
@@ -56,7 +56,7 @@ mozmill-one: mozmill-stage
 	$(MOZMILLPYTHON) runtest.py \
 	--test=$(abspath $(MOZMILLDIR))/stage/$(solo-test) \
 	--binary=$(MOZMILLPROGRAM) \
-	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
-	--plugins-path=$(abspath $(DIST)/plugins) \
+	--symbols-path=$(ABS_DIST)/crashreporter-symbols \
+	--plugins-path=$(ABS_DIST)/plugins \
 	$(MOZMILL_EXTRA)