05-define-std-vars.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (define_standard_variables): Use &transform instead
        of build_rx.
        
        
Index: automake.in
--- automake.in Fri, 26 Jan 2001 22:11:13 +0100 akim (am/f/39_automake.i 1.7 
755)
+++ automake.in Fri, 26 Jan 2001 22:15:17 +0100 akim (am/f/39_automake.i 1.7 
755)
@@ -6516,6 +6516,9 @@ sub read_am_file
     }
 }
 
+
+# define_standard_variables ()
+# ----------------------------
 # A helper for read_main_am_file which initializes configure variables
 # and variables from header-vars.am.  This is a subr so we can call it
 # twice.
@@ -6538,10 +6541,8 @@ sub define_standard_variables
     @topdir = ('.') if ! @topdir;
 
     $top_builddir = join ('/', @topdir);
-    local ($build_rx);
-    ($build_rx = $top_builddir) =~ s/(\W)/\\$1/g;
     $output_vars .= &file_contents_with_transform
-                        ('s/address@hidden@/' . $build_rx . '/g;',
+                        (&transform ('top_builddir' => $top_builddir),
                         'header-vars');
 
     # Generate some useful variables when AC_CANONICAL_* used.  FIXME: