Commit 1a70fe95 authored by Ben Laurie's avatar Ben Laurie
Browse files

Merge, go back to copy-if-different.

parent ea4507ee

util/mk1mf.pl

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}