gnome-build r484 - in trunk: . src/backends/libgbf_am/GBF

[jhs svn gnome org]

Author: jhs
Date: Fri Jan 25 09:45:37 2008
New Revision: 484
URL: http://svn.gnome.org/viewvc/gnome-build?rev=484&view=rev

Log:
2008-01-24  Philipp Kerling <k philipp gmail com>

        * src/backends/libgbf_am/GBF/AmFiles.pm:
        Append data to a macro rather than overwrite it if an assignment
        is split into several lines (#510351)



Modified:
   trunk/ChangeLog
   trunk/src/backends/libgbf_am/GBF/AmFiles.pm

Modified: trunk/src/backends/libgbf_am/GBF/AmFiles.pm
==============================================================================
--- trunk/src/backends/libgbf_am/GBF/AmFiles.pm	(original)
+++ trunk/src/backends/libgbf_am/GBF/AmFiles.pm	Fri Jan 25 09:45:37 2008
@@ -230,10 +230,12 @@
 		# Chop newline and backslash if this line is
 		# continued.  ensure trailing whitespace exists.
 		s/\\\s*$//;		
-		$last_var_value .= ' '
+		my $var_value = '';
+		$var_value = ' '
 		    unless $last_var_value =~ /\s$/;
-		$last_var_value .= $_;
-		$macros{$last_var_name}{contents} = $last_var_value;
+		$var_value .= $_;
+		$macros{$last_var_name}{contents} .= $var_value;
+		$last_var_value .= $var_value;
 	    }
 	} elsif (/$IF_PATTERN/o) {
 	    #$cond = cond_stack_if ($1, $2, $where);