[csw-devel] SF.net SVN: gar:[20066] csw/mgar/gar/v2/gar.mk

[dmichelsen at users.sourceforge.net]

Revision: 20066
          http://gar.svn.sourceforge.net/gar/?rev=20066&view=rev
Author:   dmichelsen
Date:     2013-01-09 20:18:54 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
mGAR v2: Make sure to call pre-merge and post-merge again on remerge

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2013-01-09 20:02:34 UTC (rev 20065)
+++ csw/mgar/gar/v2/gar.mk	2013-01-09 20:18:54 UTC (rev 20066)
@@ -971,7 +971,7 @@
 
 reset-merge-modulated:
 	@$(call _pmod,Reset merge state)
-	rm -f $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge-*
+	rm -f $(COOKIEDIR)/pre-merge $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge $(COOKIEDIR)/post-merge-*
 
 # The clean rule.  It must be run if you want to re-download a
 # file after a successful checksum (or just remove the checksum

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.