2009-10-20 Marcus Brinkmann <marcus@g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 20 Oct 2009 10:19:00 +0000 (10:19 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 20 Oct 2009 10:19:00 +0000 (10:19 +0000)
* src/gpg4win.mk.in (SPKG stamps/stamp-$(1)-04-install): Remove
share/info/dir to avoid stow conflicts.

ChangeLog
src/gpg4win.mk.in

index fae110f..6235284 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-20  Marcus Brinkmann  <marcus@g10code.com>
+
+       * src/gpg4win.mk.in (SPKG stamps/stamp-$(1)-04-install): Remove
+       share/info/dir to avoid stow conflicts.
+
 2009-10-08  Marcus Brinkmann  <marcus@g10code.com>
 
        * Makefile.am (EXTRA_DIST): Add
index 82c8afd..6efa6a5 100644 (file)
@@ -151,7 +151,8 @@ 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}");          \
+         rm -f "$$$${pkgidir}/share/info/dir";         \
          $(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
        touch stamps/stamp-$(1)-04-install