summaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-12-04 09:11:11 +0100
committerWerner Koch <wk@gnupg.org>2015-12-04 09:11:11 +0100
commit0fe3614d9afe42ecf80bbc932366ceeaba0a0ecc (patch)
treea04e295373e3c048181ce6ff16f6ee55c7c98510 /build-aux
parentgpg: Do not pre-check keys given on the command line. (diff)
downloadgnupg2-0fe3614d9afe42ecf80bbc932366ceeaba0a0ecc.tar.xz
gnupg2-0fe3614d9afe42ecf80bbc932366ceeaba0a0ecc.zip
speedo,w32: Improve installer.
* build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and distsigkey.gpg. (un.gnupglast): Stop dirmngr. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/speedo/w32/inst.nsi3
1 files changed, 3 insertions, 0 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 19babb9eb..cb73e914e 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -606,6 +606,8 @@ Section "GnuPG" SEC_gnupg
SetOutPath "$INSTDIR\share\gnupg"
File "share/gnupg/gpg-conf.skel"
+ File "share/gnupg/dirmngr-conf.skel"
+ File "share/gnupg/distsigkey.gpg"
SectionEnd
@@ -908,6 +910,7 @@ Section "-un.gnupglast"
no_uiserver:
ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf
ExecWait '"$INSTDIR\bin\gpgconf" --kill gpg-agent'
+ ExecWait '"$INSTDIR\bin\gpgconf" --kill dirmngr'
no_gpgconf:
SectionEnd