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

Fix "install" target for Win32 to install most utilities in a sensible location.

Browse source
This commit is contained in:
Dr. Stephen Henson 2005-11-07 00:05:27 +00:00
parent b98225ebf5
commit 5f649d583c
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
util/mk1mf.pl
View file

@ -113,7 +113,8 @@ $out_def="out";
$inc_def="outinc";
$tmp_def="tmp";
$mkdir="-mkdir";
$perl="perl" unless defined $perl;
$mkdir="-mkdir" unless defined $mkdir;
($ssl,$crypto)=("ssl","crypto");
$ranlib="echo ranlib";
@ -314,6 +315,30 @@ for (;;)
}
close(IN);
if ($shlib)
{
$extra_install= <<"EOF";
\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin
\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin
\$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib
\$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib
EOF
if ($no_static_engine)
{
$extra_install .= <<"EOF"
\$(MKDIR) \$(INSTALLTOP)${o}engines
\$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}engines
EOF
}
}
else
{
$extra_install= <<"EOF";
\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
EOF
}
$defs= <<"EOF";
# This makefile has been automatically generated from the OpenSSL distribution.
# This single makefile will build the complete OpenSSL distribution and
@ -384,6 +409,7 @@ TMP_D=$tmp_dir
INC_D=$inc_dir
INCO_D=$inc_dir${o}openssl
PERL=$perl
CP=$cp
RM=$rm
RANLIB=$ranlib
@ -470,7 +496,7 @@ lib: \$(LIBS_DEP) \$(E_SHLIB)
exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
install:
install: all
\$(MKDIR) \$(INSTALLTOP)
\$(MKDIR) \$(INSTALLTOP)${o}bin
\$(MKDIR) \$(INSTALLTOP)${o}include
@ -478,8 +504,8 @@ install:
\$(MKDIR) \$(INSTALLTOP)${o}lib
\$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
\$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
\$(CP) apps${o}openssl.cnf \$(INSTALLTOP)
$extra_install
clean:
\$(RM) \$(TMP_D)$o*.*

3
util/pl/VC-32.pl
View file

@ -7,7 +7,8 @@ $ssl= "ssleay32";
$crypto="libeay32";
$o='\\';
$cp='copy nul+'; # Timestamps get stuffed otherwise
$cp='$(PERL) util/copy.pl';
$mkdir='$(PERL) util/mkdir-p.pl';
$rm='del';
# C compiler stuff