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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-06-15 17:43:54 +0200 (Fri, 15 Jun 2007)
New Revision: 414

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-gnupg2.nsi
   trunk/src/inst-sections.nsi
Log:
First installer including gnupg2 built.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-06-15 14:31:33 UTC (rev 413)
+++ trunk/ChangeLog	2007-06-15 15:43:54 UTC (rev 414)
@@ -3,6 +3,7 @@
 	* src/gpg4win.mk.in: Add cruel hack to support gnupg2.
 
 	* src/Makefile.am: Use --silent with most configure runs.
+	(gpg4win_pkg_gnupg2_post_install): New.
 
 	* src/uninst-gnupg2.nsi, src/inst-libgnupg2.nsi: New.
 	* src/uninst-libassun.nsi, src/inst-libassuan.nsi: New.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-06-15 14:31:33 UTC (rev 413)
+++ trunk/src/Makefile.am	2007-06-15 15:43:54 UTC (rev 414)
@@ -58,6 +58,14 @@
  done)
 endef
 
+
+# The fields FAQ and faq.html conflict with those in GnuPG1.
+# For now removes them.
+define gpg4win_pkg_gnupg2_post_install	
+( rm $$$${pkgidir}/share/gnupg/FAQ; \
+  rm $$$${pkgidir}/share/gnupg/faq.html )
+endef
+
 # We would like to use --with-libiconv-prefix and
 # --with-libintl-prefix, but these don't work with the cheesy
 # non-"libfoo.la" versions of iconv and gettext that we are using.

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2007-06-15 14:31:33 UTC (rev 413)
+++ trunk/src/inst-gnupg2.nsi	2007-06-15 15:43:54 UTC (rev 414)
@@ -22,7 +22,7 @@
 !ifdef prefix
 !undef prefix
 !endif
-!define prefix ${ipdir}/gnupg-${gpg4win_pkg_gnupg2_version}
+!define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
 
 
 Section "GnuPG2" SEC_gnupg2
@@ -39,10 +39,10 @@
   # As a special exception, these programs are not kept in
   # libexec/gnupg, where they belong.  Please see the comment in
   # gnupg/g10/keyserver.c::keyserver_spawn() for an explanation.
-  File "${prefix}/libexec/gnupg/gpg2keys_finger.exe"
-  File "${prefix}/libexec/gnupg/gpg2keys_hkp.exe"
-  File "${prefix}/libexec/gnupg/gpg2keys_curl.exe"
-  File "${prefix}/libexec/gnupg/gpg2keys_ldap.exe"
+  File "${prefix}/libexec/gpg2keys_finger.exe"
+  File "${prefix}/libexec/gpg2keys_hkp.exe"
+  File "${prefix}/libexec/gpg2keys_curl.exe"
+  File "${prefix}/libexec/gpg2keys_ldap.exe"
 
   SetOutPath "$INSTDIR\pub"
   File /oname=gpg2.exe      "${BUILD_DIR}/gpgwrap.exe"

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2007-06-15 14:31:33 UTC (rev 413)
+++ trunk/src/inst-sections.nsi	2007-06-15 15:43:54 UTC (rev 414)
@@ -42,7 +42,7 @@
 !include "inst-libksba.nsi"
 !endif
 !ifdef HAVE_PKG_LIBGCRYPT
-!include "inst-libgrypt.nsi"
+!include "inst-libgcrypt.nsi"
 !endif
 !ifdef HAVE_PKG_LIBICONV
 !include "inst-libiconv.nsi"