[Gpg4win-commits] r42 - in trunk: . include src

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-03 13:57:23 +0100 (Thu, 03 Nov 2005)
New Revision: 42

Modified:
   trunk/ChangeLog
   trunk/include/config.nsi.in
   trunk/src/Makefile.am
   trunk/src/inst-winpt.nsi
Log:
Fixed WinPT building

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-03 11:00:28 UTC (rev 41)
+++ trunk/ChangeLog	2005-11-03 12:57:23 UTC (rev 42)
@@ -1,5 +1,13 @@
 2005-11-03  Werner Koch  <wk at g10code.com>
 
+	* include/config.nsi.in: Adjusted for WinPT being a source package now.
+
+	* src/inst-winpt.nsi: Adjusted location of to be installed files.
+
+	* src/Makefile.am (gpg4win_spkgs): Add winpt.
+	(gpg4win_bpkgs): Remove winpt
+	(gpg4win_pkg_winpt_configure): Added.
+
 	* configure.ac (winpt): Made it a source package.
 
 	* configure.ac: Bail out if a required tool is missing.

Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in	2005-11-03 11:00:28 UTC (rev 41)
+++ trunk/include/config.nsi.in	2005-11-03 12:57:23 UTC (rev 42)
@@ -70,7 +70,6 @@
 @HAVE_PKG_WINPT@
 !define gpg4win_pkg_winpt @gpg4win_pkg_winpt@
 !define gpg4win_pkg_winpt_version @gpg4win_pkg_winpt_version@
-!define gpg4win_pkg_winpt_src @gpg4win_pkg_winpt_src@
 
 @HAVE_PKG_GPGEE@
 !define gpg4win_pkg_gpgee @gpg4win_pkg_gpgee@

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-11-03 11:00:28 UTC (rev 41)
+++ trunk/src/Makefile.am	2005-11-03 12:57:23 UTC (rev 42)
@@ -22,7 +22,7 @@
 	libiconv.def libintl.def
 
 # Supported source packages.
-gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa
+gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa winpt
 
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
@@ -45,9 +45,13 @@
 gpg4win_pkg_gpgol_configure = \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
+gpg4win_pkg_winpt_configure = \
+  --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
+
+
 # Supported binary packages.
 gpg4win_bpkgs :=  libiconv gettext pkgconfig zlib glib libpng pango atk gtk+ \
-		  winpt gpgee
+		  gpgee
 
 # libiconv needs some special magic to generate a usable import
 # library.

Modified: trunk/src/inst-winpt.nsi
===================================================================
--- trunk/src/inst-winpt.nsi	2005-11-03 11:00:28 UTC (rev 41)
+++ trunk/src/inst-winpt.nsi	2005-11-03 12:57:23 UTC (rev 42)
@@ -27,15 +27,16 @@
 Section "winpt" SEC_winpt
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
-  File "${gpg4win_pkg_winpt_src}"
+  File "${gpg4win_pkg_winpt}"
 !else
-  File ${prefix}/WinPT.exe
-  File ${prefix}/PTD.dll
+  File ${prefix}/bin/WinPT.exe
+  File ${prefix}/bin/PTD.dll
 
-  SetOutPath "$INSTDIR\share\winpt"
-  File ${prefix}/keyserver.conf
-  File ${prefix}/NEWS-0.10.txt
-  File ${prefix}/README-0.10.txt
+  # Do not install the documentation until we have agreed on the filenames.
+  #SetOutPath "$INSTDIR\share\winpt"
+  #File ${prefix}/keyserver.conf
+  #File ${prefix}/NEWS-0.10.txt
+  #File ${prefix}/README-0.10.txt
 !endif
 SectionEnd