Merge branch 'master' of openssl.net:openssl

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index dfe28964e143d175e3a0087e86b1daaca3bcb4f6..f12f9ea3fa5bd46ad9f6c56fd27196706171d9de 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -878,6 +878,7 @@ sub fix_asm
 if ($orig_platform eq 'copy') {
        $lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
        $lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');
+       # cpuid is included by the crypto dir
        $lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');
        # AES asm files end up included by the aes dir itself
        #$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes');
@@ -1354,7 +1355,7 @@ sub do_copy_rule
                if ($n =~ /bss_file/)
                        { $pp=".c"; }
                else    { $pp=$p; }
-               $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp $to\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
+               $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp $to\n\t\$(SRC_D)${o}util${o}copy-if-different.pl \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
                }
        return($ret);
        }