Renamed nsisconf.nsi to nsisconf.nsh since it is really a include file. The NSIS installer will rename the nsisconf.nsi file to nsh if present to prevent upgrade issues.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1259 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-10-01 23:03:34 +00:00
parent c9b3214463
commit 0257d4fbc5
5 changed files with 29 additions and 6 deletions

View file

@ -32,4 +32,4 @@ A NSIS Script File (.nsi) is just a text file with a series of commands.
\c you created that you want to keep, click No)" \
\c IDNO NoRemoveLabel
\b If a file named "nsisconf.nsi" in the same directory as makensis.exe exists, it will be included by default before any scripts (unless the /NOCONFIG command line parameter is used.
\b If a file named "nsisconf.nsh" in the same directory as makensis.exe exists, it will be included by default before any scripts (unless the /NOCONFIG command line parameter is used.

View file

@ -13,7 +13,7 @@ NSIS installers are generated by using the 'MakeNSIS' program to compile a NSIS
\b /PAUSE makes Makensis pause before quitting, which is useful when executing directly from Windows (the auto-installed shell extensions use it).
\b /NOCONFIG disables inclusion of [path to makensis.exe]\\nsisconf.nsi . Without this parameter, installer defaults are set from nsisconf.nsi. See NSIS Configuration File.
\b /NOCONFIG disables inclusion of [path to makensis.exe]\\nsisconf.nsh . Without this parameter, installer defaults are set from nsisconf.nsi. See NSIS Configuration File.
\b /CMDHELP prints basic usage information for command (if specified), or all commands (if command is not specified).