From: Ben Laurie <ben@links.org>
Date: Sat, 6 Apr 2013 14:15:11 +0000 (+0100)
Subject: Merge, go back to copy-if-different.
X-Git-Tag: master-post-reformat~1340
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=1a70fe953a65a1b7ed3814c1bb415814f628ba44

Merge, go back to copy-if-different.
---

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);
 	}