* automake.in (handle_programs) <xexe>: Remove, replaced by

`exeext'.
Use it, and &transform.

diff --git a/ChangeLog b/ChangeLog
index 46316b6f73acf37335832ee2be3da164cf9040a2..48610b59ea8cb0a56161f59f9bb20b856925a772 100644 (file)
--- 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 5ce38654ffc6cf3163299e4812d3753bdf6caa8e..89a533e488db88b49a79239e3be4484c52553636 100755 (executable)
--- 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))