2006-04-27 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 27 Apr 2006 10:46:17 +0000 (10:46 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 27 Apr 2006 10:46:17 +0000 (10:46 +0000)
* 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.

ChangeLog
src/Makefile.am
src/gpg4win.mk.in
src/inst-gnupg.nsi
src/uninst-gnupg.nsi

index 8af0588..9263ba6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-27  Marcus Brinkmann  <marcus@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@g10code.com>
 
        Released 1.0.1.
index 7ff8021..3925a19 100644 (file)
@@ -37,6 +37,16 @@ gpg4win_pkg_glib_configure = \
   --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.
index 9746585..76f8216 100644 (file)
@@ -136,11 +136,14 @@ stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
          $(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
index c7bf96d..33bb6ac 100644 (file)
@@ -47,6 +47,9 @@ Section "GnuPG" SEC_gnupg
   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
index 9b09a1d..61c5fbc 100644 (file)
@@ -44,6 +44,9 @@ Section "-un.gnupg"
   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"