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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-04-27 12:46:17 +0200 (Thu, 27 Apr 2006)
New Revision: 294

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/gpg4win.mk.in
   trunk/src/inst-gnupg.nsi
   trunk/src/uninst-gnupg.nsi
Log:
2006-04-27  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): New macro to
	generate man pages.
	* src/gpg4win.mk.in (stamps/stamp-$(1)-04-install): Invoke post
	install macro.
	* src/inst-gnupg.nsi: Install man pages.
	* src/uninst-gnupg.nsi: Uninstall man pages.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-04-26 10:02:23 UTC (rev 293)
+++ trunk/ChangeLog	2006-04-27 10:46:17 UTC (rev 294)
@@ -1,3 +1,12 @@
+2006-04-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): New macro to
+	generate man pages.
+	* src/gpg4win.mk.in (stamps/stamp-$(1)-04-install): Invoke post
+	install macro.
+	* src/inst-gnupg.nsi: Install man pages.
+	* src/uninst-gnupg.nsi: Uninstall man pages.
+
 2006-04-26  Werner Koch  <wk at g10code.com>
 
 	Released 1.0.1.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-04-26 10:02:23 UTC (rev 293)
+++ trunk/src/Makefile.am	2006-04-27 10:46:17 UTC (rev 294)
@@ -37,6 +37,16 @@
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
   CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 
+# The GnuPG package provides man pages which we have to convert.
+define gpg4win_pkg_gnupg_post_install	
+(man -Tlatin1 -l $$$${pkgidir}/man/man1/gpg.1 | sed `printf "s/\b.//g"` | \
+ sed -e 's/$$$$/\r/' > $$$${pkgidir}/man/man1/gpg.man; \
+man -Tlatin1 -l $$$${pkgidir}/man/man1/gpgv.1 | sed `printf "s/\b.//g"` | \
+ sed -e 's/$$$$/\r/' > $$$${pkgidir}/man/man1/gpgv.man; \
+man -Tlatin1 -l $$$${pkgidir}/man/man7/gnupg.7 | sed `printf "s/\b.//g"` | \
+ sed -e 's/$$$$/\r/' > $$$${pkgidir}/man/man7/gnupg.man)
+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/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2006-04-26 10:02:23 UTC (rev 293)
+++ trunk/src/gpg4win.mk.in	2006-04-27 10:46:17 UTC (rev 294)
@@ -136,11 +136,14 @@
 	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
 	touch stamps/stamp-$(1)-03-make
 
+# Note that post_install must come last because it may be empty and
+# "; ;" is a syntax error.
 stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
 	($(call SETVARS,$(1));				\
 	  cd "$$$${pkgbdir}";				\
 	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
-	  $(call STRIP_macro,"$$$${pkgidir}"))
+	  $(call STRIP_macro,"$$$${pkgidir}"); \
+	  $(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
 	touch stamps/stamp-$(1)-04-install
 
 stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install

Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi	2006-04-26 10:02:23 UTC (rev 293)
+++ trunk/src/inst-gnupg.nsi	2006-04-27 10:46:17 UTC (rev 294)
@@ -47,6 +47,9 @@
   File "${prefix}/share/gnupg/options.skel"
   File "${prefix}/share/gnupg/FAQ"
   File "${prefix}/share/gnupg/faq.html"
+  File "${prefix}/man/man1/gpg.man"
+  File "${prefix}/man/man1/gpgv.man"
+  File "${prefix}/man/man7/gnupg.man"
 
   WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
 !endif

Modified: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi	2006-04-26 10:02:23 UTC (rev 293)
+++ trunk/src/uninst-gnupg.nsi	2006-04-27 10:46:17 UTC (rev 294)
@@ -44,6 +44,9 @@
   Delete "$INSTDIR\share\gnupg\options.skel"
   Delete "$INSTDIR\share\gnupg\FAQ"
   Delete "$INSTDIR\share\gnupg\faq.html"
+  Delete "$INSTDIR\share\gnupg\gpg.man"
+  Delete "$INSTDIR\share\gnupg\gpgv.man"
+  Delete "$INSTDIR\share\gnupg\gnupg.man"
   RMDir "$INSTDIR\share\gnupg"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR"