2007-10-16 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 16 Oct 2007 15:18:02 +0000 (15:18 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 16 Oct 2007 15:18:02 +0000 (15:18 +0000)
* src/uninst-dirmngr.nsi: Remove etc files.
* src/inst-dirmngr.nsi: Do not use wildcard.

ChangeLog
src/inst-dirmngr.nsi
src/uninst-dirmngr.nsi

index 1706edb..bc784ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-16  Marcus Brinkmann  <marcus@g10code.de>
 
+       * src/uninst-dirmngr.nsi: Remove etc files.
+       * src/inst-dirmngr.nsi: Do not use wildcard.
+
        * src/uninst-qt.nsi: Uninstall qt.conf.
 
        * src/uninst-qt.nsi: Uninstall mingwm10.dll.
index c5ad8d1..fd0a455 100644 (file)
@@ -49,7 +49,7 @@ Section "-dirmngr" SEC_dirmngr
 
    SetOutPath "$INSTDIR\etc\dirmngr\trusted-certs"
    File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
-   File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/*.crt"
+   File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
 
   dirmngr_no_conf:
 
index 58efe68..949f230 100644 (file)
@@ -40,9 +40,18 @@ Section "-un.dirmngr"
   Delete "$INSTDIR\dirmngr-client.exe"
   Delete "$INSTDIR\dirmngr_ldap.exe"
   RMDir "$INSTDIR\cache"
-  RMDir "$INSTDIR"
 
   # Remove etc files.
 
+  Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"
+  Delete "$INSTDIR\etc\dirmngr\bnetza-10r-ocsp.signer"
+
+  Delete "$INSTDIR\etc\dirmngr\trusted-certs\README"
+  Delete "$INSTDIR\etc\dirmngr\trusted-certs\bnetza-10r-ca.crt"
+
+  RMDir "$INSTDIR\etc\dirmngr\trusted-certs"
+  RMDir "$INSTDIR\etc\dirmngr"
+  RMDir "$INSTDIR\etc"
+  RMDir "$INSTDIR"
 !endif
 SectionEnd