From abbe9fc884cb4f0e4affb91b389220e4dac00709 Mon Sep 17 00:00:00 2001 From: "ben%bengoodger.com" Date: Wed, 18 Feb 2004 20:58:20 +0000 Subject: [PATCH] 229036 - start menu links to readme and license don't work,.... patch from simon paquet --- browser/app/Makefile.in | 6 ++++++ browser/app/splash.rc | 4 ++-- browser/installer/windows/browser.jst | 2 +- browser/installer/windows/config.it | 2 +- browser/installer/windows/packages-static | 2 ++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 2f3d00ca9ed2..89acdcd80e25 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -249,3 +249,9 @@ libs:: $(PROGRAM) clean clobber:: rm -rf $(DIST)/$(APP_NAME).app endif + +README_FILE = $(topsrcdir)/README.txt + +libs:: + $(INSTALL) $(README_FILE) $(DIST)/bin + $(INSTALL) $(topsrcdir)/LICENSE $(DIST)/bin diff --git a/browser/app/splash.rc b/browser/app/splash.rc index abc388f3fecf..dfd2aa1de822 100644 --- a/browser/app/splash.rc +++ b/browser/app/splash.rc @@ -71,8 +71,8 @@ BEGIN ID_DDE_APPLICATION_NAME, "Firefox Debug" IDS_STARTMENU_APPNAME, "Firefox Debug" #else - ID_DDE_APPLICATION_NAME, "Firefox" - IDS_STARTMENU_APPNAME, "Firefox" + ID_DDE_APPLICATION_NAME, "Firefox Debug" + IDS_STARTMENU_APPNAME, "Firefox Debug" #endif END diff --git a/browser/installer/windows/browser.jst b/browser/installer/windows/browser.jst index e20b92e6e1e3..cdaae8f3fe7c 100644 --- a/browser/installer/windows/browser.jst +++ b/browser/installer/windows/browser.jst @@ -71,7 +71,7 @@ function createShortcuts() fTemp = fProgram + "$MainExeFile$"; fileExe = getFolder("file:///", fTemp); fileReadme = getFolder("file:///", fProgram + "readme.txt"); - fileLicense = getFolder("file:///", fProgram + "license.txt"); + fileLicense = getFolder("file:///", fProgram + "license"); scExeDesc = "$ProductName$"; scReadmeDesc = "Readme"; scLicenseDesc = "License"; diff --git a/browser/installer/windows/config.it b/browser/installer/windows/config.it index 937304565a41..63534e9d3ac6 100644 --- a/browser/installer/windows/config.it +++ b/browser/installer/windows/config.it @@ -201,7 +201,7 @@ Show Dialog=TRUE Title=Software License Agreement ;*** LOCALIZE ME BABY *** Sub Title=Terms and conditions for using this software. -License File=license.txt +License File=license ;*** LOCALIZE ME BABY *** Message0=Please read the following license agreement. Use the scroll bar to view the rest of this agreement. ;*** LOCALIZE ME BABY *** diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static index 12561c88a634..7813a2864aac 100644 --- a/browser/installer/windows/packages-static +++ b/browser/installer/windows/packages-static @@ -46,6 +46,8 @@ bin\firefox.exe bin\plugins\npnul32.dll bin\res\cmessage.txt bin\xpicleanup.exe +bin\LICENSE +bin\README.txt ; [Components] bin\components\alerts.xpt