From: <d_p...@us...> - 2010-02-09 16:01:28
|
Revision: 2280 http://ganglia.svn.sourceforge.net/ganglia/?rev=2280&view=rev Author: d_pocock Date: 2010-02-09 16:01:19 +0000 (Tue, 09 Feb 2010) Log Message: ----------- Use awk to escape commas in CFLAGS and LDFLAGS so that sed script will not break (backport r2279) Modified Paths: -------------- branches/monitor-core-3.1/scripts/fixconfig.in Modified: branches/monitor-core-3.1/scripts/fixconfig.in =================================================================== --- branches/monitor-core-3.1/scripts/fixconfig.in 2010-02-07 10:53:39 UTC (rev 2279) +++ branches/monitor-core-3.1/scripts/fixconfig.in 2010-02-09 16:01:19 UTC (rev 2280) @@ -15,6 +15,8 @@ ## which is under a BSD-style license ## +AWK="@AWK@" + # The paths set by configure. prefix="@prefix@" exec_prefix="@exec_prefix@" @@ -26,8 +28,8 @@ includedir="@includedir@" # Additional variables set by configure -CFLAGS="@CFLAGS@" -LDFLAGS="@LDFLAGS@" +CFLAGS="`echo '@CFLAGS@' | $AWK '{ gsub(/,/, "\\\\,"); print }'`" +LDFLAGS="`echo '@LDFLAGS@' | $AWK '{ gsub(/,/, "\\\\,"); print }'`" LIBS="@LIBS@" VERSION="@VERSION@" host_cpu="@host_cpu@" @@ -70,8 +72,8 @@ -e "s,@sbindir[@],$sbindir,g" \ -e "s,@sysconfdir[@],$sysconfdir,g" \ -e "s,@includedir[@],$includedir,g" \ - -e "s!@CFLAGS[@]!$CFLAGS!g" \ - -e "s!@LDFLAGS[@]!$LDFLAGS!g" \ + -e "s,@CFLAGS[@],$CFLAGS,g" \ + -e "s,@LDFLAGS[@],$LDFLAGS,g" \ -e "s,@LIBS[@],$LIBS,g" \ -e "s,@VERSION[@],$VERSION,g" \ -e "s,@host_cpu[@],$host_cpu,g" \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |