From: Akim Demaille <akim@epita.fr>
Date: Mon, 29 Jan 2001 09:16:00 +0000 (+0000)
Subject: * automake.in (define_standard_variables): Use &transform instead
X-Git-Tag: Release-1-4d~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a93be5671a7e510851c563687adfeeb126f5a84;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index 64faa81d6..f06268b22 100644
--- 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 5741b02a9..9418d049a 100755
--- 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: