fixes bug 327465 "Move uninstaller.inc from locales into installer/windows/" r+a=bsmedberg

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@190217 18797224-902f-48f8-a5cc-f745e15eee43
2006-02-16 15:49:39 +00:00
parent d51c7857ba
commit e668110478
4 changed files with 2 additions and 2 deletions
--- a/mozilla/browser/Makefile.in
+++ b/mozilla/browser/Makefile.in
@@ -55,7 +55,7 @@ DEFINES += -DOFFICIAL_BRANDING=1
 endif

 # Generate uninstall.ini (en-US only for now)
-UNINSTALLER_INC = $(topsrcdir)/browser/locales/en-US/installer/uninstaller.inc
+UNINSTALLER_INC = $(topsrcdir)/browser/installer/windows/uninstaller.inc
 $(FINAL_TARGET)/uninstall/uninstall.ini: $(topsrcdir)/browser/installer/windows/uninstall.it $(UNINSTALLER_INC)
 	$(NSINSTALL) -D $(@D)
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(UNINSTALLER_INC) $< > $@
--- a/mozilla/browser/locales/en-US/installer/uninstaller.inc
+++ b/mozilla/browser/locales/en-US/installer/uninstaller.inc
--- a/mozilla/mail/Makefile.in
+++ b/mozilla/mail/Makefile.in
@@ -54,7 +54,7 @@ ifdef MOZ_INSTALLER
 DIRS += installer/windows

 # Generate uninstall.ini (en-US only for now)
-UNINSTALLER_INC = $(topsrcdir)/mail/locales/en-US/installer/uninstaller.inc
+UNINSTALLER_INC = $(topsrcdir)/mail/installer/windows/uninstaller.inc
 $(FINAL_TARGET)/uninstall/uninstall.ini: $(topsrcdir)/mail/installer/windows/uninstall.it $(UNINSTALLER_INC)
 	$(NSINSTALL) -D $(@D)
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(UNINSTALLER_INC) $< > $@
--- a/mozilla/mail/locales/en-US/installer/uninstaller.inc
+++ b/mozilla/mail/locales/en-US/installer/uninstaller.inc