commit 9e9bececa9e9a89bf7b42a90c95b06eb3a2ee7a3
author Dr. Stephen Henson <steve@openssl.org> Sun Jan 15 17:31:08 2006 +0000
committer Dr. Stephen Henson <steve@openssl.org> Sun Jan 15 17:31:08 2006 +0000
tree 17ca51c8ce8f62bd80627ec2f83d1a6852cc7bc2
parent 90890074b0bf983bfd0f59b7571aa334faaef989

Fix from stable branch.

crypto/dso/dso_win32.c

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 34b94b3..d98a3e8 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -578,14 +578,14 @@
 		}
 	else
 		{
-		filespec1_split = win32_splitter(dso, filespec1, 1);
+		filespec1_split = win32_splitter(dso, filespec1, 0);
 		if (!filespec1_split)
 			{
 			DSOerr(DSO_F_WIN32_MERGER,
 				ERR_R_MALLOC_FAILURE);
 			return(NULL);
 			}
-		filespec2_split = win32_splitter(dso, filespec2, 0);
+		filespec2_split = win32_splitter(dso, filespec2, 1);
 		if (!filespec2_split)
 			{
 			DSOerr(DSO_F_WIN32_MERGER,

util/mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6b3f1a0..a0ec39e 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -339,8 +339,8 @@
 	if ($no_static_engine)
 		{
 		$extra_install .= <<"EOF"
-	\$(MKDIR) \$(INSTALLTOP)${o}engines
-	\$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}engines
+	\$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
+	\$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
 EOF
 		}
 	}