[csw-devel] SF.net SVN: gar:[9928] csw/mgar/gar/v2-bwalton/gar.mk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Wed May 19 04:15:21 CEST 2010
Revision: 9928
http://gar.svn.sourceforge.net/gar/?rev=9928&view=rev
Author: bdwalton
Date: 2010-05-19 02:15:21 +0000 (Wed, 19 May 2010)
Log Message:
-----------
gar/v2-bwalton: only run post-patch-gitsnap if !global modulation; do not depend on worksrc for post-patch-gitsnap
Modified Paths:
--------------
csw/mgar/gar/v2-bwalton/gar.mk
Modified: csw/mgar/gar/v2-bwalton/gar.mk
===================================================================
--- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-18 21:12:12 UTC (rev 9927)
+++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-19 02:15:21 UTC (rev 9928)
@@ -450,7 +450,7 @@
patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch
@$(DONADA)
-patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-gitsnap post-patch-$(MODULATION) post-patch-modulated
+patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated
@$(DONADA)
# returns true if patch has completed successfully, false
@@ -458,7 +458,7 @@
patch-p:
@$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
-post-patch-gitsnap: $(WORKSRC) $(PATCH_TARGETS)
+post-patch-gitsnap: $(PATCH_TARGETS)
@echo "Tagging top of current csw patch stack..."
@( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) )
@$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list