Fix for Win32 dynamic engine loading.

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 795c0aacfc93fdc7c306e88433b6de1cae316e89..fd3dd6a7fe3df9bd657f41ca8126e69502627b2a 100644 (file)
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -570,14 +570,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 ba26f28fc63f409f300d81da4c7eee606e6395c3..10eb19c671624bfbaf15fbdb9ab40dac6a2c7746 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -338,8 +338,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
                }
        }