From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 15 Jan 2006 17:31:08 +0000 (+0000)
Subject: Fix from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~1582
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e9bececa9e9a89bf7b42a90c95b06eb3a2ee7a3;p=oweals%2Fopenssl.git

Fix from stable branch.
---

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 34b94b3d1d..d98a3e85f3 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -578,14 +578,14 @@ static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2
 		}
 	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,
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6b3f1a03a1..a0ec39e5f0 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -339,8 +339,8 @@ EOF
 	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
 		}
 	}