From 42a169200d1735b25f6a3c64d108671768070c64 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Fri, 23 Mar 2001 17:16:02 +0000
Subject: [PATCH] * automake.in (&handle_footer, &handle_installdirs)
 (&read_main_am_file): Don't read %contents directly, use &variable_value.

---
 ChangeLog   |  7 +++++++
 automake.in | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe50880c..f25ee2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-23  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (&handle_footer, &handle_installdirs)
+	(&read_main_am_file): Don't read %contents directly, use
+	&variable_value.
+
+	
 2001-03-23  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&read_am_file): Define the variables in a single
diff --git a/automake.in b/automake.in
index 33381189..081e49fd 100755
--- a/automake.in
+++ b/automake.in
@@ -3770,19 +3770,19 @@ sub handle_gettext
 # Handle footer elements.
 sub handle_footer
 {
-    if ($contents{'SOURCES'})
+    if (variable_value ('SOURCES'))
     {
 	# NOTE don't use define_pretty_variable here, because
 	# $contents{...} is already defined.
-	$output_vars .= 'SOURCES = ' . $contents{'SOURCES'} . "\n";
+	$output_vars .= 'SOURCES = ' . variable_value ('SOURCES') . "\n";
     }
-    if ($contents{'OBJECTS'})
+    if (variable_value ('OBJECTS'))
     {
 	# NOTE don't use define_pretty_variable here, because
 	# $contents{...} is already defined.
-	$output_vars .= 'OBJECTS = ' . $contents{'OBJECTS'} . "\n";
+	$output_vars .= 'OBJECTS = ' . variable_value ('OBJECTS') . "\n";
     }
-    if ($contents{'SOURCES'} || $contents{'OBJECTS'})
+    if (variable_value ('SOURCES') || variable_value ('OBJECTS'))
     {
 	$output_vars .= "\n";
     }
@@ -3827,7 +3827,7 @@ sub handle_installdirs ()
     $output_rules .=
       &file_contents ('install',
 		      ('_am_installdirs'
-		       => $contents{'_am_installdirs'} || ''));
+		       => variable_value ('_am_installdirs') || ''));
 }
 
 
@@ -6641,7 +6641,7 @@ sub read_main_am_file
 	else
 	{
 	    $output_vars .= ($var . ' ' . $def_type{$var} . '= '
-			     . $contents{$var} . "\n");
+			     . variable_value ($var) . "\n");
 	}
     }
 
@@ -6655,7 +6655,7 @@ sub read_main_am_file
     # not change.
     foreach my $var (keys %saved_contents)
     {
-	if ($contents{$var} eq $saved_contents{$var})
+	if (variable_value ($var) eq $saved_contents{$var})
 	{
 	    delete $contents{$var};
 	}
-- 
2.43.5