Fix from stable branch.

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 34b94b3d1df16d2cba05f041127a5d4996f74e4c..d98a3e85f3921a51ce8c3086a1b0c96c2ab5b906 100644 (file)
--- 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 6b3f1a03a19a8c3de298451083ec89424eb9e833..a0ec39e5f06a35b29cd16822425f9cfc9bce20de 100755 (executable)
--- 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
                }
        }