Fix from stable branch.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 15 Jan 2006 17:31:08 +0000 (17:31 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 15 Jan 2006 17:31:08 +0000 (17:31 +0000)
crypto/dso/dso_win32.c
util/mk1mf.pl

index 34b94b3..d98a3e8 100644 (file)
@@ -578,14 +578,14 @@ static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2
                }
        else
                {
                }
        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);
                        }
                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,
                if (!filespec2_split)
                        {
                        DSOerr(DSO_F_WIN32_MERGER,
index 6b3f1a0..a0ec39e 100755 (executable)
@@ -339,8 +339,8 @@ EOF
        if ($no_static_engine)
                {
                $extra_install .= <<"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
                }
        }
 EOF
                }
        }