From 3a38cae827cc5a4395216fd4925075986b5e4a02 Mon Sep 17 00:00:00 2001 From: "rob_strong%exchangecode.com" Date: Wed, 30 Aug 2006 01:06:39 +0000 Subject: [PATCH] Bustage fix for checkin of Bug 349551 --- browser/installer/windows/Makefile.in | 12 ++++++++++++ calendar/installer/windows/Makefile.in | 12 ++++++++++++ mail/installer/windows/Makefile.in | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index 07ae4202333d..50472fe34b8e 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -83,6 +83,18 @@ installer:: # For building the uninstaller during the application build so it can be # included for mar file generation. uninstaller:: + $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) + $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) + $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) + $(EXIT_ON_ERROR) \ + for i in $(PP_LOCALIZED_FILES); do \ + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \ + done + $(PERL) $(topsrcdir)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \ + $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi + $(PERL) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \ + $(topsrcdir) $(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer $(AB_CD) \ + $(WIN_INSTALLER_CHARSET) $(CONFIG_DIR) $(CONFIG_DIR)/setup.exe:: $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) diff --git a/calendar/installer/windows/Makefile.in b/calendar/installer/windows/Makefile.in index 66d83ea1f2d6..82111c6b29d7 100644 --- a/calendar/installer/windows/Makefile.in +++ b/calendar/installer/windows/Makefile.in @@ -83,6 +83,18 @@ installer:: # For building the uninstaller during the application build so it can be # included for mar file generation. uninstaller:: + $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) + $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) + $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) + $(EXIT_ON_ERROR) \ + for i in $(PP_LOCALIZED_FILES); do \ + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \ + done + $(PERL) $(topsrcdir)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \ + $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi + $(PERL) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \ + $(topsrcdir) $(call EXPAND_LOCALE_SRCDIR,calendar/locales)/installer $(AB_CD) \ + $(WIN_INSTALLER_CHARSET) $(CONFIG_DIR) $(CONFIG_DIR)/setup.exe:: $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) diff --git a/mail/installer/windows/Makefile.in b/mail/installer/windows/Makefile.in index a09c8e9e251b..00991443cfac 100644 --- a/mail/installer/windows/Makefile.in +++ b/mail/installer/windows/Makefile.in @@ -83,6 +83,18 @@ installer:: # For building the uninstaller during the application build so it can be # included for mar file generation. uninstaller:: + $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) + $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) + $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) + $(EXIT_ON_ERROR) \ + for i in $(PP_LOCALIZED_FILES); do \ + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \ + done + $(PERL) $(topsrcdir)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \ + $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi + $(PERL) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \ + $(topsrcdir) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer $(AB_CD) \ + $(WIN_INSTALLER_CHARSET) $(CONFIG_DIR) $(CONFIG_DIR)/setup.exe:: $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)