From 1a70fe953a65a1b7ed3814c1bb415814f628ba44 Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@links.org>
Date: Sat, 6 Apr 2013 15:15:11 +0100
Subject: [PATCH] Merge, go back to copy-if-different.

---
 util/mk1mf.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index fb13f2e11f..f3a84380d1 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -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);
 	}
-- 
2.34.1