From 4a18d5c89bc6c8b96a4c79f542e974a54148d257 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sat, 18 Jun 2011 19:02:12 +0000
Subject: Don't add trailing slash to FIPSDIR: it causes problems with Windows
 builds.

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

(limited to 'util')

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 369c9fdd89..b1474cb6ac 100755
--- 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,10 +483,10 @@ 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
-- 
cgit v1.2.3