Merge, go back to copy-if-different.
authorBen Laurie <ben@links.org>
Sat, 6 Apr 2013 14:15:11 +0000 (15:15 +0100)
committerBen Laurie <ben@links.org>
Sat, 6 Apr 2013 14:15:11 +0000 (15:15 +0100)
util/mk1mf.pl

index fb13f2e..f3a8438 100755 (executable)
@@ -1372,8 +1372,7 @@ sub do_copy_rule
                if ($n =~ /bss_file/)
                        { $pp=".c"; }
                else    { $pp=$p; }
-#              $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(PERL) \$(SRC_D)${o}util${o}copy-if-different.pl \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
-               $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
+               $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(PERL) \$(SRC_D)${o}util${o}copy-if-different.pl \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
                }
        return($ret);
        }