Use correct C format for keysets.pl

[openssl.git] / util / pl / BC-32.pl

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index f0f8c9e8d150e1ebb2b50a63b43f739ee9bb24c0..6d061d3b6805224435adfdf6a2d433a2c7bf0fce 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -2,13 +2,13 @@
 # Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
 #
 
-$ssl=  "ssleay32";
-$crypto="libeay32";
+$ssl=  "libssl32";
+$crypto="libcrypto32";
 
 $o='\\';
 $cp='copy';
 $rm='del';
-$mv='move /Y";
+$mv='move /Y';
 
 # C compiler stuff
 $cc='bcc32';
@@ -99,9 +99,6 @@ sub do_rehash_rule {
     my ($target, $deps) = @_;
     my $ret = <<"EOF";
 $target: $deps
-       set OPENSSL=\$(BIN_D)${o}openssl.exe
-       set OPENSSL_DEBUG_MEMORY=on
-       \$(PERL) \$(BIN_D)${o}c_rehash certs/demo
        echo off > $target
 EOF
     return $ret
@@ -113,8 +110,9 @@ $target: $deps force.$target
        set TOP=.
        set BIN_D=\$(BIN_D)
        set TEST_D=\$(TEST_D)
+       set OPENSSL_ENGINES=\$(ENG_D)
        set PERL=\$(PERL)
-       \$(PERL) test\\$test_cmd
+       \$(PERL) test\\$test_cmd \$(TESTS)
 force.$target:
 EOF
 }
@@ -143,7 +141,7 @@ ___
                {
                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
                $ex.=' ws2_32.lib gdi32.lib';
-               $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+               $ret.="\t\$(LINK_CMD) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
                }
        $ret.="\n";
        return($ret);
@@ -157,7 +155,7 @@ sub do_link_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($target);
        $ret.="$target: $files $dep_libs\n";
-       $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
+       $ret.="\t\$(LINK_CMD) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
        return($ret);
        }