sha1-x86_64.pl: nasm-related update from HEAD.

[oweals/openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 369c9fdd8965df6e6e89111c0724e33a33d57690..192e449ce4ab93014f97fcb9b4678a1218ca66a7 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -59,7 +59,7 @@ while(<IN>) {
 }
 close(IN);
 
-$fipsdir =~ tr/\\/\//;
+$fipsdir =~ tr/\//${o}/;
 $debug = 1 if $mf_platform =~ /^debug-/;
 
 die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
@@ -483,13 +483,13 @@ ASM=$bin_dir$asm
 
 FIPSDIR=$fipsdir
 BASEADDR=$baseaddr
-FIPSLIB_D=\$(FIPSDIR)lib
+FIPSLIB_D=\$(FIPSDIR)${o}lib
 FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c
 O_FIPSCANISTER=\$(FIPSLIB_D)${o}fipscanister.lib
-FIPS_SHA1_EXE=\$(FIPSDIR)bin${o}fips_standalone_sha1${exep}
+FIPS_SHA1_EXE=\$(FIPSDIR)${o}bin${o}fips_standalone_sha1${exep}
 E_PREMAIN_DSO=fips_premain_dso
 PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep
-FIPSLINK=\$(PERL) \$(FIPSDIR)bin${o}fipslink.pl
+FIPSLINK=\$(PERL) \$(FIPSDIR)${o}bin${o}fipslink.pl
 
 ######################################################
 # You should not need to touch anything below this point