Bug 955394 - Port |Bug 851117 - comm-aurora changes required for repacking l10n on win64, using mozconfigs, objdirs, and pre-built mar tools|, r=florian.

--HG--
extra : rebase_source : d2b39d3bf6061d55da222fe95b6b0f96627ce1f1

im/locales/Makefile.in

@@ -43,8 +43,7 @@ RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@addons.instantbird.org
 
-PREF_JS_EXPORTS = $(firstword $(wildcard $(LOCALE_SRCDIR)/all-l10n.js) \
-                       $(srcdir)/en-US/all-l10n.js )
+PREF_JS_EXPORTS = $(call MERGE_FILE,all-l10n.js)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
@@ -145,7 +144,7 @@ installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
 	@echo "repackaging done"
 
 ifdef MOZ_UPDATER
-libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
+libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
 ifeq ($(OS_ARCH),WINNT)
 	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
 	  sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \