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

[wahwah at users.sourceforge.net]

Revision: 12474
          http://gar.svn.sourceforge.net/gar/?rev=12474&view=rev
Author:   wahwah
Date:     2011-01-09 21:28:05 +0000 (Sun, 09 Jan 2011)

Log Message:
-----------
mGAR v2: A bugfix for EXPANDVARS

The 'g' parameter was missing, and only one instance of a variable was
expanded per line.  This patch adds 'g' to the perl invocation which expands
variables.

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2011-01-09 19:14:56 UTC (rev 12473)
+++ csw/mgar/gar/v2/gar.mk	2011-01-09 21:28:05 UTC (rev 12474)
@@ -444,7 +444,7 @@
 _var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR)))
 
 expandvars-%:
-	$(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$*
+	$(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$*
 	@$(MAKECOOKIE)
 
 


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