bug 509095 - wget-en-US broken with mozilla-central, empty , r=Standard8
authorRobert Kaiser <kairo@kairo.at>
Sat, 08 Aug 2009 02:23:23 +0200
changeset 3252 2a7b6871311bf48709e1bdfacdd5b75464c11979
parent 3251 09db9f1b4ad6f928a4ed35c1fd20f293d08bf388
child 3253 134486bf6eacd6821dfc8a19d299724b4dea06a9
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs509095
bug 509095 - wget-en-US broken with mozilla-central, empty , r=Standard8
mail/locales/Makefile.in
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -56,16 +56,20 @@ SUBMAKEFILES += \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
 	$(NULL)
 
 # This makefile uses variable overrides from the libs-% target to
 # build non-default locales to non-default dist/ locations. Be aware!
 
 AB = $(firstword $(subst -, ,$(AB_CD)))
 
+# On mozilla-central, packager.mk uses core_abspath to redefine _ABS_DIST on Mac
+# As the comm-central config.mk doesn't set it, do it ourselves instead
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+
 # These are defaulted to be compatible with the files the wget-en-US target
 # 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
 
 DEFINES += \