[Gpg4win-commits] r1595 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: colinleroy
Date: 2010-12-15 17:05:27 +0100 (Wed, 15 Dec 2010)
New Revision: 1595

Modified:
   trunk/ChangeLog
   trunk/src/inst-pinentry.nsi
Log:
2010-12-15  Colin Leroy  <colin at colino.net>

	* src/inst-pinentry.nsi: Fix NSIS builds without QT.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-12-15 15:43:25 UTC (rev 1594)
+++ trunk/ChangeLog	2010-12-15 16:05:27 UTC (rev 1595)
@@ -1,3 +1,7 @@
+2010-12-15  Colin Leroy  <colin at colino.net>
+
+	* src/inst-pinentry.nsi: Fix NSIS builds without QT.
+
 2010-12-15  Marcus Brinkmann  <marcus at g10code.com>
 
 	* src/Makefile.am (gpg4win_pkg_claws_mail_post_install): New macro.

Modified: trunk/src/inst-pinentry.nsi
===================================================================
--- trunk/src/inst-pinentry.nsi	2010-12-15 15:43:25 UTC (rev 1594)
+++ trunk/src/inst-pinentry.nsi	2010-12-15 16:05:27 UTC (rev 1595)
@@ -37,6 +37,7 @@
   File "${prefix}/bin/pinentry-w32.exe"
   File "${prefix}/bin/pinentry-gtk-2.exe"
 !ifndef GPG4WIN_LIGHT
+!ifdef HAVE_PKG_QT
   File "${prefix}/bin/pinentry-qt4.exe"
 
   # If Qt is installed (usually by selecting kleopatra), we want
@@ -49,6 +50,7 @@
   Goto inst_pinentry_done
   inst_pinentry_skip_qt:
 !endif
+!endif
   File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
   inst_pinentry_done: