From: Akim Demaille <akim@epita.fr>
Date: Thu, 18 Jan 2001 17:20:09 +0000 (+0000)
Subject: * automake.in (handle_texinfo): Use &transform, and transform
X-Git-Tag: v1.10.2~2337
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67b8104753d83908020a89052e8b69d0dc9e0b43;p=platform%2Fupstream%2Fautomake.git

* automake.in (handle_texinfo): Use &transform, and transform
CONFIGURE_AC.
Reported by Lars Hecking, and diagnosed by Raja R Harinath.
---

diff --git a/ChangeLog b/ChangeLog
index d294f9e..e80eb22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-18  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (handle_texinfo): Use &transform, and transform
+	CONFIGURE_AC.
+	Reported by Lars Hecking, and diagnosed by Raja R Harinath.
+
 2001-01-16  Akim Demaille  <akim@epita.fr>
 
 	Let Automake support `configure.ac'.
diff --git a/automake.in b/automake.in
index ae328f1..7637b53 100755
--- a/automake.in
+++ b/automake.in
@@ -2276,10 +2276,11 @@ sub handle_texinfo
 	    ($conf_pat = $conf_dir) =~ s/(\W)/\\$1/g;
 	    $output_rules .=
 		&file_contents_with_transform
-		    ('s/\@TEXI\@/' . $info_cursor . '/g; '
-		     . 's/\@VTI\@/' . $vti . '/g; '
-		     . 's/\@VTEXI\@/' . $vtexi . '/g;'
-		     . 's,\@MDDIR\@,' . $conf_pat . ',g;',
+		    (&transform ('TEXI'        	=> $info_cursor,
+				 'VTI'         	=> $vti,
+				 'VTEXI'       	=> $vtexi,
+				 'MDDIR'       	=> $conf_pat,
+				 'CONFIGURE_AC' => $configure_ac),
 		     'texi-vers');
 
 	    &push_phony_cleaners ($vti);
@@ -3325,7 +3326,7 @@ sub handle_configure
     }
     else
     {
-        local ($xform) = &transform ("CONFIGURE_AC" => $configure_ac);
+        local ($xform) = &transform ('CONFIGURE_AC' => $configure_ac);
 	&handle_aclocal_m4;
 	$output_rules .= &file_contents_with_transform ($xform,
 							'remake');