From 6a93be5671a7e510851c563687adfeeb126f5a84 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 29 Jan 2001 09:16:00 +0000 Subject: [PATCH] * automake.in (define_standard_variables): Use &transform instead of build_rx. --- ChangeLog | 6 ++++++ automake.in | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64faa81..f06268b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-01-29 Akim Demaille + * automake.in (define_standard_variables): Use &transform instead + of build_rx. + + +2001-01-29 Akim Demaille + * automake.in (handle_texinfo): Use the new $texinfodir instead of the removed $texinfo_tex. diff --git a/automake.in b/automake.in index 5741b02..9418d04 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: -- 2.7.4