summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2007-02-03 13:43:53 +0000
committerDr. Stephen Henson <steve@openssl.org>2007-02-03 13:43:53 +0000
commit913236a4f874f1e99405c4dd021f0c3f00c5831c (patch)
tree0b52e88ad770f310328d088be73599fa3eafe7aa
parentc6292a2636aced5ee292cca334ccb93efd834366 (diff)
Fix paths for --onedir and Unix.
-rw-r--r--fips-1.0/mkfipsscr.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/fips-1.0/mkfipsscr.pl b/fips-1.0/mkfipsscr.pl
index d803e5855f..601a46184e 100644
--- a/fips-1.0/mkfipsscr.pl
+++ b/fips-1.0/mkfipsscr.pl
@@ -100,7 +100,6 @@ foreach (@ARGV)
}
$tvdir = "testvectors" unless defined $tvdir;
-$shwrap_prefix = "../util/" unless defined $shwrap_prefix;
if ($win32)
{
@@ -131,10 +130,12 @@ else
if ($onedir)
{
$tprefix = "./" unless defined $tprefix;
+ $shwrap_prefix = "./" unless defined $shwrap_prefix;
}
else
{
$tprefix = "../test/" unless defined $tprefix;
+ $shwrap_prefix = "../util/" unless defined $shwrap_prefix;
}
$outfile = "fipstests.sh" unless defined $outfile;
open(OUT, ">$outfile");
@@ -218,7 +219,7 @@ END
}
else
{
- my $req = "tvdir/$tdir/req/$fprefix.req";
+ my $req = "$tvdir/$tdir/req/$fprefix.req";
my $rsp = "$tvdir/$tdir/rsp/$fprefix.rsp";
print OUT <<END;
if [ -f $req ] ; then ${shwrap_prefix}shlib_wrap.sh $tprefix$tcmd < $req > $rsp; fi