summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-02-12 23:20:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-02-12 23:20:21 +0000
commit424ba8b58871dcda97f115894bd0ddc6d120d579 (patch)
treef0b225f202704c0ce6434a0660787f72f3c1fa47 /util
parentbf493e8d6265e066f41c27e04e12637c7a370874 (diff)
PR: 2708
Submitted by: Bruce Stephens <bruce.stephens@isode.com> Translate path separators correctly for $fipsdir in util/mk1mf.pl
Diffstat (limited to 'util')
-rwxr-xr-xutil/mk1mf.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 916175ab39..72fa089f6b 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -59,7 +59,6 @@ while(<IN>) {
}
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;