From: Dr. Stephen Henson Date: Sun, 12 Feb 2012 23:20:21 +0000 (+0000) Subject: PR: 2708 X-Git-Tag: OpenSSL_1_0_1-beta3~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=424ba8b58871dcda97f115894bd0ddc6d120d579;p=thirdparty%2Fopenssl.git PR: 2708 Submitted by: Bruce Stephens Translate path separators correctly for $fipsdir in util/mk1mf.pl --- diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 916175ab395..72fa089f6b9 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -59,7 +59,6 @@ while() { } close(IN); -$fipsdir =~ tr/\//${o}/; $debug = 1 if $mf_platform =~ /^debug-/; die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq ""; @@ -234,6 +233,8 @@ else $cflags.=' -DTERMIO'; } +$fipsdir =~ s/\//${o}/g; + $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":""); $tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":""); $inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;