diff options
| author | Werner Koch <wk@gnupg.org> | 2015-05-06 11:06:26 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-05-06 11:06:26 +0200 |
| commit | 154abaf3c97dae43ba972e4482680a287f3e5c39 (patch) | |
| tree | d03e9f4e716483381a2ec40793918a61a4e3a9c4 /build-aux/speedo | |
| parent | g10: fix cmp_public_key. (diff) | |
| download | gnupg2-154abaf3c97dae43ba972e4482680a287f3e5c39.tar.xz gnupg2-154abaf3c97dae43ba972e4482680a287f3e5c39.zip | |
speedo,w32: Install a native pinentry.
* build-aux/speedo.mk: Always build pinentry for w32.
(speedo_pkg_pinentry_configure): Adjust to modern pinentry.
* build-aux/speedo/w32/inst.nsi: Install native pinentry under the
name pinentry-basic.exe.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'build-aux/speedo')
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index e88a91c5c..19babb9eb 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -816,12 +816,10 @@ Section "-gtk+" SEC_gtk_ SectionEnd !endif -!ifdef WITH_GUI Section "-pinentry" SEC_pinentry SetOutPath "$INSTDIR\bin" - File /oname=pinentry.exe "bin/pinentry-gtk-2.exe" + File /oname=pinentry-basic.exe "bin/pinentry-w32.exe" SectionEnd -!endif !ifdef WITH_GUI Section "gpa" SEC_gpa @@ -933,11 +931,9 @@ Section "-un.gpa" SectionEnd !endif -!ifdef WITH_GUI Section "-un.pinentry" - Delete "$INSTDIR\bin\pinentry.exe" + Delete "$INSTDIR\bin\pinentry-basic.exe" SectionEnd -!endif !ifdef WITH_GUI Section "-un.gtk+" |