* automake.in (define_standard_variables): Use &transform instead

of build_rx.

diff --git a/ChangeLog b/ChangeLog
index 64faa81d6ff0f45231ff15a141da2b6a8ae62164..f06268b227288ea4f32dc6c934e358c80dce3e5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-29  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (define_standard_variables): Use &transform instead
+       of build_rx.
+
+       
 2001-01-29  Akim Demaille  <akim@epita.fr>
 
        * automake.in (handle_texinfo): Use the new $texinfodir instead of

diff --git a/automake.in b/automake.in
index 5741b02a9a4c8093d17d07953746f5636072ba4e..9418d049aa88e3d03ed5eb0204c1505cc58977ea 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6523,6 +6523,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.
@@ -6545,10 +6548,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/\@top_builddir\@/' . $build_rx . '/g;',
+                        (&transform ('top_builddir' => $top_builddir),
                         'header-vars');
 
     # Generate some useful variables when AC_CANONICAL_* used.  FIXME: