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

@ -47,8 +47,10 @@ Section "NSIS Development System (required)" SecCore
File ..\makensisw.exe
File ..\makensis.htm
File ..\license.txt
IfFileExists $INSTDIR\nsisconf.nsi "" +2
Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh
SetOverwrite off
File ..\nsisconf.nsi
File ..\nsisconf.nsh
SetOverwrite try
SetOutPath $INSTDIR\Docs
@ -62,7 +64,6 @@ SectionEnd
Section "NSIS Examples (recommended)" SecExample
SectionIn 1 2 3
SetOutPath $INSTDIR\Examples
Delete $INSTDIR\*.nsh
Delete $INSTDIR\viewhtml.nsi
Delete $INSTDIR\waplugin.nsi
Delete $INSTDIR\example*.nsi
@ -657,6 +658,7 @@ Section Uninstall
Delete $INSTDIR\license.txt
Delete $INSTDIR\uninst-nsis.exe
Delete $INSTDIR\nsisconf.nsi
Delete $INSTDIR\nsisconf.nsh
Delete $INSTDIR\Examples\makensis.nsi
Delete $INSTDIR\Examples\example1.nsi
Delete $INSTDIR\Examples\example2.nsi