Commit 8da1de4a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent 7bff8fd2

util/mk1mf.pl

+21 −21
Original line number Diff line number Diff line
@@ -476,24 +476,24 @@ if ($fips) 
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

	\$(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}lib${o}engines

	\$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines

	\$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"

	\$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"

EOF

		}

	}

else

	{

	$extra_install= <<"EOF";

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

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

	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"

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

EOF

	$ex_libs .= " $zlib_lib" if $zlib_opt == 1;

	}
@@ -651,7 +651,7 @@ banner: 
$banner



\$(TMP_D):

	\$(MKDIR) \$(TMP_D)

	\$(MKDIR) \"\$(TMP_D)\"

# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different

#\$(BIN_D):

#	\$(MKDIR) \$(BIN_D)
@@ -660,13 +660,13 @@ $banner 
#	\$(MKDIR) \$(TEST_D)



\$(LIB_D):

	\$(MKDIR) \$(LIB_D)

	\$(MKDIR) \"\$(LIB_D)\"



\$(INCO_D): \$(INC_D)

	\$(MKDIR) \$(INCO_D)

	\$(MKDIR) \"\$(INCO_D)\"



\$(INC_D):

	\$(MKDIR) \$(INC_D)

	\$(MKDIR) \"\$(INC_D)\"



headers: \$(HEADER) \$(EXHEADER)

	@
@@ -676,14 +676,14 @@ lib: \$(LIBS_DEP) \$(E_SHLIB) 
exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep



install: all

	\$(MKDIR) \$(INSTALLTOP)

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

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

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

	\$(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) apps${o}openssl.cnf \$(INSTALLTOP)

	\$(MKDIR) \"\$(INSTALLTOP)\"

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

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

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

	\$(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) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"

$extra_install
@@ -1240,7 +1240,7 @@ sub do_copy_rule 
		if ($n =~ /bss_file/)

			{ $pp=".c"; }

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

	}