From e668110478b564b55b84fc8e3fdf235f4f04e78a Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Thu, 16 Feb 2006 15:49:39 +0000 Subject: [PATCH] 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 --- mozilla/browser/Makefile.in | 2 +- .../en-US/installer => installer/windows}/uninstaller.inc | 0 mozilla/mail/Makefile.in | 2 +- .../en-US/installer => installer/windows}/uninstaller.inc | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename mozilla/browser/{locales/en-US/installer => installer/windows}/uninstaller.inc (100%) rename mozilla/mail/{locales/en-US/installer => installer/windows}/uninstaller.inc (100%) diff --git a/mozilla/browser/Makefile.in b/mozilla/browser/Makefile.in index 3290d2594bb..dd2b2e71728 100644 --- 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) $< > $@ diff --git a/mozilla/browser/locales/en-US/installer/uninstaller.inc b/mozilla/browser/installer/windows/uninstaller.inc similarity index 100% rename from mozilla/browser/locales/en-US/installer/uninstaller.inc rename to mozilla/browser/installer/windows/uninstaller.inc diff --git a/mozilla/mail/Makefile.in b/mozilla/mail/Makefile.in index 7b630cd37ee..a59bde06f5c 100644 --- 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) $< > $@ diff --git a/mozilla/mail/locales/en-US/installer/uninstaller.inc b/mozilla/mail/installer/windows/uninstaller.inc similarity index 100% rename from mozilla/mail/locales/en-US/installer/uninstaller.inc rename to mozilla/mail/installer/windows/uninstaller.inc