[Gpg4win-commits] r630 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-12-07 14:38:51 +0100 (Fri, 07 Dec 2007)
New Revision: 630

Modified:
   trunk/src/inst-gpgex.nsi
Log:
Fix last change.


Modified: trunk/src/inst-gpgex.nsi
===================================================================
--- trunk/src/inst-gpgex.nsi	2007-12-07 13:35:37 UTC (rev 629)
+++ trunk/src/inst-gpgex.nsi	2007-12-07 13:38:51 UTC (rev 630)
@@ -23,12 +23,8 @@
 !define prefix ${ipdir}/gpgex-${gpg4win_pkg_gpgex_version}
 
 
-Section "GpgEX" SEC_gpgex
-  SetOutPath "$INSTDIR"
-!ifdef SOURCES
-  File "${gpg4win_pkg_gpgex}"
-!else
-
+Section "-removegpgee"
+!ifndef SOURCES
 # Uninstall a previous gpgee version, if it exists.
   ifFileExists "$INSTDIR\GPGee.dll" 0 gpgex_no_gpgee
     UnRegDLL "$INSTDIR\GPGee.dll"
@@ -40,7 +36,16 @@
     RMDir "$INSTDIR\share"
     RMDir "$INSTDIR"
   gpgex_no_gpgee:
+!endif
+SectionEnd
 
+
+Section "GpgEX" SEC_gpgex
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_gpgex}"
+!else
+
   ClearErrors
   SetOverwrite try
   File ${prefix}/bin/gpgex.dll