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

[dmichelsen at users.sourceforge.net]

Revision: 14808
          http://gar.svn.sourceforge.net/gar/?rev=14808&view=rev
Author:   dmichelsen
Date:     2011-06-14 11:28:00 +0000 (Tue, 14 Jun 2011)

Log Message:
-----------
mGAR v2: Variable expansion now works when values contain spaces

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2011-06-14 09:45:40 UTC (rev 14807)
+++ csw/mgar/gar/v2/gar.mk	2011-06-14 11:28:00 UTC (rev 14808)
@@ -445,7 +445,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 " if( /@([^@]+)@/ )' <$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.