Fix paths for --onedir and Unix.

diff --git a/fips-1.0/mkfipsscr.pl b/fips-1.0/mkfipsscr.pl
index d803e5855f00139622486f5f3a78471812e9b270..601a46184eed2912fb39b77733987964becb8be7 100644 (file)
--- 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