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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-06-19 21:57:08 +0200 (Fri, 19 Jun 2009)
New Revision: 1187

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
Log:
2009-06-19  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_scute_configure): Fix typo, should
	have been gpg-error, not gpgme.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-19 10:46:13 UTC (rev 1186)
+++ trunk/ChangeLog	2009-06-19 19:57:08 UTC (rev 1187)
@@ -1,5 +1,8 @@
 2009-06-19  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/Makefile.am (gpg4win_pkg_scute_configure): Fix typo, should
+	have been gpg-error, not gpgme.
+
 	* Makefile.am (EXTRA_DIST): Fix path to gnupg2 patch file.
 
 2009-06-19  Emanuel Schuetze  <emanuel.schuetze at intevation.de>

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-06-19 10:46:13 UTC (rev 1186)
+++ trunk/src/Makefile.am	2009-06-19 19:57:08 UTC (rev 1187)
@@ -21,7 +21,7 @@
         installer-options.ini.in libiconv.def libintl.def loreley.mid \
         gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
         inst-sections.nsi installer.nsi installer-finish.nsi  \
-	QtCore.pc QtGui.pc \ 
+	QtCore.pc QtGui.pc \
         qt.conf kleowrap.c potomo Memento.nsh dirmngr.conf    \
         inst-gpg4win.nsi	   uninst-gpg4win.nsi	      \
         inst-atk.nsi               uninst-atk.nsi	      \
@@ -278,7 +278,7 @@
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
 
 gpg4win_pkg_scute_configure = --silent \
-  --with-gpgme-prefix=$(idir) --with-libassuan-prefix=$(idir)
+  --with-gpg-error-prefix=$(idir) --with-libassuan-prefix=$(idir)
 
 gpg4win_pkg_paperkey_configure = --silent
 
@@ -448,14 +448,14 @@
 # writes the file with DOS line endings.  This helps to avoid
 # duplicate entries in case one package has been rebuild (which is
 # common when developing a new version).
-versioninfo.txt : playground/build/versioninfo.txt
-	set -e; \
-	( while read a b; do echo "$$a $$(basename $$b)"; \
-            done < playground/build/versioninfo.txt \
-          | sort -k2 -sf | tac | uniq -f1 ; \
-          echo '=========== SHA-1 checksum ============= == package ==' \
-         ) | tac | awk '{printf "%s\r\n", $$0}' > versioninfo.txt
+# Support macro.  Record version number of file $(1).
+define VERSIONINFO_macro
+         $(SHA1SUM) "$(1)" >> 
+endef
 
+versioninfo.txt:
+	$(SHA1SUM) $(pkg_files) >> versioninfo.txt
+
 NEWS.tmp : $(top_srcdir)/NEWS
 	sed -e '/^#/d' <$(top_srcdir)/NEWS >NEWS.tmp