[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpg4win-commits
Subject:    [Gpg4win-commits] r1304 - in trunk: . src
From:       scm-commit () wald ! intevation ! org
Date:       2009-10-20 10:19:01
Message-ID: 20091020101901.8F5B4861EAD4 () pyrosoma ! intevation ! org
[Download RAW message or body]

Author: marcus
Date: 2009-10-20 12:19:00 +0200 (Tue, 20 Oct 2009)
New Revision: 1304

Modified:
   trunk/ChangeLog
   trunk/src/gpg4win.mk.in
Log:
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.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-10 23:19:49 UTC (rev 1303)
+++ trunk/ChangeLog	2009-10-20 10:19:00 UTC (rev 1304)
@@ -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

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2009-10-10 23:19:49 UTC (rev 1303)
+++ trunk/src/gpg4win.mk.in	2009-10-20 10:19:00 UTC (rev 1304)
@@ -151,7 +151,8 @@
 	($(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
 

_______________________________________________
Gpg4win-commits mailing list
Gpg4win-commits@wald.intevation.org
http://lists.wald.intevation.org/mailman/listinfo/gpg4win-commits
[prev in list] [next in list] [prev in thread] [next in thread]