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

[dmichelsen at users.sourceforge.net]

Revision: 5193
          http://gar.svn.sourceforge.net/gar/?rev=5193&view=rev
Author:   dmichelsen
Date:     2009-06-08 08:12:06 +0000 (Mon, 08 Jun 2009)

Log Message:
-----------
mGAR v2: Add modulation-specific PAX args and fix remerge-bug

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-06-08 08:05:40 UTC (rev 5192)
+++ csw/mgar/gar/v2/gar.mk	2009-06-08 08:12:06 UTC (rev 5193)
@@ -595,7 +595,7 @@
 # has not, so we use this one for appending.
 
 
-_PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS)
+_PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS)
 
 # The basic merge merges the compiles for all ISAs on the current architecture
 merge: checksum pre-merge $(addprefix merge-,$(MODULATIONS)) merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
@@ -649,7 +649,7 @@
 remerge: reset-merge merge
 
 reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src
-	@rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge
+	@rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge
 	@rm -rf $(PKGROOT)
 	@$(DONADA)
 


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