* automake.in (&handle_footer, &handle_installdirs)

(&read_main_am_file): Don't read %contents directly, use
&variable_value.

diff --git a/ChangeLog b/ChangeLog
index fe50880c47d2d328facc8e79a56a757c15cd1c73..f25ee2ab80d97afc6a67cb04c410e18212c68a13 100644 (file)
--- 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 33381189fb5e8241710c171fedda5b977ecc0899..081e49fdbf6f715a380b103a977b3622417b0eff 100755 (executable)
--- 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};
        }