From 41c39e33667024efa19a19b0188da5f57045df43 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 15 Jan 2006 17:28:35 +0000 Subject: [PATCH] Fix for Win32 dynamic engine loading. --- crypto/dso/dso_win32.c | 4 ++-- util/mk1mf.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 795c0aacfc..fd3dd6a7fe 100644 --- 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 ba26f28fc6..10eb19c671 100755 --- 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 } } -- 2.34.1