Commit 2e9f1bf0 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent b1e0ccba

util/mk1mf.pl

+35 −4
Original line number Original line Diff line number Diff line
@@ -113,7 +113,8 @@ $out_def="out"; 
$inc_def="outinc";

$inc_def="outinc";

$tmp_def="tmp";

$tmp_def="tmp";





$mkdir="-mkdir";

$perl="perl" unless defined $perl;

$mkdir="-mkdir" unless defined $mkdir;





($ssl,$crypto)=("ssl","crypto");

($ssl,$crypto)=("ssl","crypto");

$ranlib="echo ranlib";

$ranlib="echo ranlib";
@@ -314,6 +315,30 @@ for (;;) 
	}

	}

close(IN);

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";

$defs= <<"EOF";

# This makefile has been automatically generated from the OpenSSL distribution.

# This makefile has been automatically generated from the OpenSSL distribution.

# This single makefile will build the complete OpenSSL distribution and

# This single makefile will build the complete OpenSSL distribution and
@@ -384,6 +409,7 @@ TMP_D=$tmp_dir 
INC_D=$inc_dir

INC_D=$inc_dir

INCO_D=$inc_dir${o}openssl

INCO_D=$inc_dir${o}openssl





PERL=$perl

CP=$cp

CP=$cp

RM=$rm

RM=$rm

RANLIB=$ranlib

RANLIB=$ranlib
@@ -470,7 +496,7 @@ lib: \$(LIBS_DEP) \$(E_SHLIB) 




exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep

exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep





install:

install: all

	\$(MKDIR) \$(INSTALLTOP)

	\$(MKDIR) \$(INSTALLTOP)

	\$(MKDIR) \$(INSTALLTOP)${o}bin

	\$(MKDIR) \$(INSTALLTOP)${o}bin

	\$(MKDIR) \$(INSTALLTOP)${o}include

	\$(MKDIR) \$(INSTALLTOP)${o}include
@@ -478,8 +504,13 @@ install: 
	\$(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) \$(O_SSL) \$(INSTALLTOP)${o}lib

	\$(CP) apps${o}openssl.cnf \$(INSTALLTOP)

	\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib

$extra_install





test: \$(T_EXE)

	cd \$(BIN_D)

	..${o}ms${o}test





clean:

clean:

	\$(RM) \$(TMP_D)$o*.*

	\$(RM) \$(TMP_D)$o*.*

util/pl/VC-32.pl

+2 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,8 @@ $ssl= "ssleay32"; 
$crypto="libeay32";

$crypto="libeay32";





$o='\\';

$o='\\';

$cp='copy nul+';	# Timestamps get stuffed otherwise

$cp='$(PERL) util/copy.pl';

$mkdir='$(PERL) util/mkdir-p.pl';

$rm='del';

$rm='del';





# C compiler stuff

# C compiler stuff