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

[dmichelsen at users.sourceforge.net]

Revision: 17928
          http://gar.svn.sourceforge.net/gar/?rev=17928&view=rev
Author:   dmichelsen
Date:     2012-05-02 13:49:34 +0000 (Wed, 02 May 2012)
Log Message:
-----------
mGAR v2: Allow multiple different variable expansions in one line

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-05-02 12:47:24 UTC (rev 17927)
+++ csw/mgar/gar/v2/gar.mk	2012-05-02 13:49:34 UTC (rev 17928)
@@ -480,7 +480,7 @@
 
 # The rule takes all files from EXPANDVARS and replaces all occurrences of @<var>@ in the file
 # with the values of <var> from the Makefile.
-_var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)="$($(VAR))")
+_var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " while( /@([^@]+)@/g );' <$1),$(VAR)="$($(VAR))")
 
 expandvars-%:
 	$(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$*

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