Revision: 3910
http://gar.svn.sourceforge.net/gar/?rev=3910&view=rev
Author: dmichelsen
Date: 2009-03-24 15:04:00 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
mGAR v2: Fix remerge to also reset license
Modified Paths:
--------------
csw/mgar/gar/v2/gar.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2009-03-24 13:29:15 UTC (rev 3909)
+++ csw/mgar/gar/v2/gar.mk 2009-03-24 15:04:00 UTC (rev 3910)
@@ -626,7 +626,7 @@
.PHONY: remerge reset-merge reset-merge-modulated
remerge: reset-merge merge
-reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS))
+reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS))
reset-merge-license
@rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M)
$(COOKIEDIR)/merge
@rm -rf $(PKGROOT)
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-03-24 13:29:15 UTC (rev 3909)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-03-24 15:04:00 UTC (rev 3910)
@@ -421,6 +421,9 @@
merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC))
@$(DONADA)
+reset-merge-license:
+ @rm -f $(COOKIEDIR)/merge-license $(foreach
SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC))
+
# package - Use the mkpackage utility to create Solaris packages
#
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
