diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 5 | ||||
| -rw-r--r-- | scripts/w32installer.nsi | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 692598fff..ae87f3a0d 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2006-10-02 Werner Koch <[email protected]> + + * w32installer.nsi: Don't uninstall winpt if the installer comes + without it. I fixed it despite of what I said in bug 521. + 2006-09-13 Werner Koch <[email protected]> * autogen.sh: Better detection of the cross compiler. diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi index 5a3266408..5a8c668c4 100644 --- a/scripts/w32installer.nsi +++ b/scripts/w32installer.nsi @@ -385,11 +385,14 @@ Section "Uninstall" Delete "$INSTDIR\gpgsplit.exe" Delete "$INSTDIR\gpgv.exe" + +!ifdef WITH_WINPT Delete "$INSTDIR\WinPT.exe" Delete "$INSTDIR\PTD.dll" Delete "$INSTDIR\Doc\README.winpt.txt" Delete "$INSTDIR\Doc\NEWS.winpt.txt" Delete "$INSTDIR\Doc\keyserver.conf" +!endif Delete "$INSTDIR\Doc\gnupg.man" Delete "$INSTDIR\Doc\gpg.man" |