wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update from HEAD.

Browse source
This commit is contained in:
Dr. Stephen Henson 2008-01-03 16:37:51 +00:00
parent 7bff8fd23d
commit 8da1de4a5a
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
util/mk1mf.pl
View file

@ -476,24 +476,24 @@ if ($fips)
if ($shlib) if ($shlib)
{ {
$extra_install= <<"EOF"; $extra_install= <<"EOF";
\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
\$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
\$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
EOF EOF
if ($no_static_engine) if ($no_static_engine)
{ {
$extra_install .= <<"EOF" $extra_install .= <<"EOF"
\$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
\$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
EOF EOF
} }
} }
else else
{ {
$extra_install= <<"EOF"; $extra_install= <<"EOF";
\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
EOF EOF
$ex_libs .= " $zlib_lib" if $zlib_opt == 1; $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
} }
@ -651,7 +651,7 @@ banner:
$banner $banner
\$(TMP_D): \$(TMP_D):
\$(MKDIR) \$(TMP_D) \$(MKDIR) \"\$(TMP_D)\"
# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
#\$(BIN_D): #\$(BIN_D):
# \$(MKDIR) \$(BIN_D) # \$(MKDIR) \$(BIN_D)
@ -660,13 +660,13 @@ $banner
# \$(MKDIR) \$(TEST_D) # \$(MKDIR) \$(TEST_D)
\$(LIB_D): \$(LIB_D):
\$(MKDIR) \$(LIB_D) \$(MKDIR) \"\$(LIB_D)\"
\$(INCO_D): \$(INC_D) \$(INCO_D): \$(INC_D)
\$(MKDIR) \$(INCO_D) \$(MKDIR) \"\$(INCO_D)\"
\$(INC_D): \$(INC_D):
\$(MKDIR) \$(INC_D) \$(MKDIR) \"\$(INC_D)\"
headers: \$(HEADER) \$(EXHEADER) headers: \$(HEADER) \$(EXHEADER)
@ @
@ -676,14 +676,14 @@ lib: \$(LIBS_DEP) \$(E_SHLIB)
exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
install: all install: all
\$(MKDIR) \$(INSTALLTOP) \$(MKDIR) \"\$(INSTALLTOP)\"
\$(MKDIR) \$(INSTALLTOP)${o}bin \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
\$(MKDIR) \$(INSTALLTOP)${o}include \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
\$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
\$(MKDIR) \$(INSTALLTOP)${o}lib \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
\$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
\$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
\$(CP) apps${o}openssl.cnf \$(INSTALLTOP) \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
$extra_install $extra_install
@ -1240,7 +1240,7 @@ sub do_copy_rule
if ($n =~ /bss_file/) if ($n =~ /bss_file/)
{ $pp=".c"; } { $pp=".c"; }
else { $pp=$p; } else { $pp=$p; }
$ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n"; $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
} }
return($ret); return($ret);
} }