107-handle-languages-morphing-7.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&handle_languages): Don't transform %COMPILER%.
        Use `$lang->compiler' instead of `$pfx' to transform generic
        %COMPILE% and %LTCOMPILE%.
        * ext-compile.am: Use %COMPILE%, %COMPILER% and %SOURCE% instead
        of %COMPILER% and $<.
        
        
Index: automake.in
--- automake.in Sat, 31 Mar 2001 13:11:46 +0200 akim (am/f/39_automake.i 1.242 
755)
+++ automake.in Sat, 31 Mar 2001 13:24:06 +0200 akim (am/f/39_automake.i 1.242 
755)
@@ -1384,9 +1384,8 @@ sub handle_languages
                           'LTOBJ'     => '$@',
                           'OBJOBJ'    => '$@',
 
-                          'COMPILER' => $lang->compiler,
-                          'COMPILE'   => '$(' . $pfx . 'COMPILE)',
-                          'LTCOMPILE' => '$(LT' . $pfx . 'COMPILE)',
+                          'COMPILE'   => '$(' . $lang->compiler . ')',
+                          'LTCOMPILE' => '$(LT' . $lang->compiler . ')',
                           'OUTARG'   => $outarg,
                           'LTOUTARG' => $ltoutarg);
 
Index: ext-compile.am
--- ext-compile.am Tue, 27 Mar 2001 23:57:56 +0200 akim (am/h/38_ext-compil 1.2 
644)
+++ ext-compile.am Sat, 31 Mar 2001 13:22:42 +0200 akim (am/h/38_ext-compil 1.2 
644)
@@ -20,14 +20,14 @@
 ## LTOUTARG is set to `', or `-o $@'.
 
 .%EXT%.o:
-       $(%COMPILER%) %OUTARG% $<
+       %COMPILE% %OUTARG% %SOURCE%
 
 .%EXT%.obj:
 ## FIXME: Using cygpath should be somehow conditional.
-       $(%COMPILER%) %OUTARG% `cygpath -w $<`
+       %COMPILE% %OUTARG% `cygpath -w %SOURCE%`
 
 if %?LIBTOOL%
 .%EXT%.lo:
 ## We don't care if there are several `-o', libtool handles it gracefully.
-       $(LT%COMPILER%) %OUTARG% %LTOUTARG% $<
+       %LTCOMPILE% %OUTARG% %LTOUTARG% %SOURCE%
 endif %?LIBTOOL%