From ca7d4367ac09de8bbc2204c3869d095580db76cd Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Wed, 28 Jun 2006 23:26:14 +0000 Subject: [PATCH] Bug 339714 - submakefiles sucks git-svn-id: svn://10.0.0.236/trunk@201159 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/locales/Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/browser/locales/Makefile.in b/mozilla/browser/locales/Makefile.in index ea93d20578c..d844e9ffcac 100644 --- a/mozilla/browser/locales/Makefile.in +++ b/mozilla/browser/locales/Makefile.in @@ -52,7 +52,10 @@ run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); f _ABS_DIST := $(shell cd $(DIST) && pwd) ifdef MOZ_BRANDING_DIRECTORY -SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile +SUBMAKEFILES += \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ + $(NULL) endif # This makefile uses variable overrides from the libs-% target to @@ -168,7 +171,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk include $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/charset.mk repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/install/sea/$(PKG_BASENAME).installer.exe -repackage-win32-installer: $(WIN32_INSTALLER_IN) +repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." ifdef MOZ_BRANDING_DIRECTORY $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export