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

[dmichelsen at users.sourceforge.net]

Revision: 16395
          http://gar.svn.sourceforge.net/gar/?rev=16395&view=rev
Author:   dmichelsen
Date:     2011-12-07 19:48:01 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
mGAR v2: Allow empty reinplacement value and change regex parantheses to rarely used curly braces

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2011-12-07 19:46:08 UTC (rev 16394)
+++ csw/mgar/gar/v2/gar.mk	2011-12-07 19:48:01 UTC (rev 16395)
@@ -420,7 +420,6 @@
 $(foreach REINPLACEMENT,$(_ALL_REINPLACEMENTS),\
   $(if $(REINPLACE_FILES_$(REINPLACEMENT)),,$(error Reinplacement '$(REINPLACEMENT)' has been set but REINPLACE_FILES_$(REINPLACEMENT) is empty))\
   $(if $(REINPLACE_MATCH_$(REINPLACEMENT)),,$(error Reinplacement '$(REINPLACEMENT)' has been set but REINPLACE_MATCH_$(REINPLACEMENT) is empty))\
-  $(if $(REINPLACE_WITH_$(REINPLACEMENT)),,$(error Reinplacement '$(REINPLACEMENT)' has been set but REINPLACE_WITH_$(REINPLACEMENT) is empty))\
 )
 
 # We call an additional extract-modulated without resetting any variables so
@@ -487,7 +486,7 @@
 	@$(MAKECOOKIE)
 
 post-extract-reinplace-%:
-	-perl -p -i$(REINPLACE_BACKUP_$*) -e "s($(REINPLACE_MATCH_$*))($(REINPLACE_WITH_$*))g" \
+	-perl -p -i$(REINPLACE_BACKUP_$*) -e 's{$(REINPLACE_MATCH_$*)}{$(REINPLACE_WITH_$*)}g' \
 		$(addprefix $(WORKSRC)/,$(REINPLACE_FILES_$*))
 	@( if [ -d "$(PATCHDIR)/.git" ]; then \
 		echo "Committing reinplacements..."; \

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