02-handle-programs.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (handle_programs) <xexe>: Remove, replaced by
        `exeext'.
        Use it, and &transform.
        
        
Index: automake.in
--- automake.in Fri, 26 Jan 2001 21:37:09 +0100 akim (am/f/39_automake.i 1.4 
755)
+++ automake.in Fri, 26 Jan 2001 21:47:38 +0100 akim (am/f/39_automake.i 1.4 
755)
@@ -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/address@hidden@/\$(EXEEXT)/g;';
-       }
-       else
-       {
-           $xexe = 's/address@hidden@//g;';
+           $exeext = '$(EXEEXT)';
        }
 
        $output_rules .=
            &file_contents_with_transform
-               ('s/address@hidden@/' . $one_file . '/go;'
-                . 's/address@hidden@/' . $xname . '/go;'
-                . 's/address@hidden@/' . $xlink . '/go;'
-                . $xexe,
-                'program');
+             (&transform ('EXEEXT'   => $exeext,
+                          'PROGRAM'  => $one_file,
+                          'XPROGRAM' => $xname,
+                          'XLINK'    => $xlink),
+              'program');
     }
 
     if (&variable_defined ('LDADD') && &handle_lib_objects ('', 'LDADD', 0))