From 0039568563aaee22ed5d9eb06c78d7099baa87e2 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 29 Jan 2001 09:00:32 +0000
Subject: [PATCH] * automake.in (handle_programs) <xexe>: Remove, replaced by
 `exeext'. Use it, and &transform.

---
 ChangeLog   |  7 +++++++
 automake.in | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46316b6f..48610b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-29  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (handle_programs) <xexe>: Remove, replaced by
+	`exeext'.
+	Use it, and &transform.
+
+	
 2001-01-29  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (get_object_extension) <$default_includes>: New.
diff --git a/automake.in b/automake.in
index 5ce38654..89a533e4 100755
--- a/automake.in
+++ b/automake.in
@@ -1708,6 +1708,9 @@ sub check_canonical_spelling
     return $xname;
 }
 
+
+# handle_programs ()
+# ------------------
 # Handle C programs.
 sub handle_programs
 {
@@ -1798,23 +1801,19 @@ sub handle_programs
 	    $xlink = $linker ? $linker : 'LINK';
 	}
 
-	local ($xexe);
+	local ($exeext) = '';
 	if ($seen_exeext && $one_file !~ /\./)
 	{
-	    $xexe = 's/\@EXEEXT\@/\$(EXEEXT)/g;';
-	}
-	else
-	{
-	    $xexe = 's/\@EXEEXT\@//g;';
+	    $exeext = '$(EXEEXT)';
 	}
 
 	$output_rules .=
 	    &file_contents_with_transform
-		('s/\@PROGRAM\@/' . $one_file . '/go;'
-		 . 's/\@XPROGRAM\@/' . $xname . '/go;'
-		 . 's/\@XLINK\@/' . $xlink . '/go;'
-		 . $xexe,
-		 'program');
+	      (&transform ('EXEEXT'   => $exeext,
+			   'PROGRAM'  => $one_file,
+			   'XPROGRAM' => $xname,
+			   'XLINK'    => $xlink),
+	       'program');
     }
 
     if (&variable_defined ('LDADD') && &handle_lib_objects ('', 'LDADD', 0))
-- 
2.43.5