Fix from stable branch.

This commit is contained in:
Dr. Stephen Henson 2006-01-15 17:31:08 +00:00
parent 90890074b0
commit 9e9bececa9
2 changed files with 4 additions and 4 deletions

View 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) if (!filespec1_split)
{ {
DSOerr(DSO_F_WIN32_MERGER, DSOerr(DSO_F_WIN32_MERGER,
ERR_R_MALLOC_FAILURE); ERR_R_MALLOC_FAILURE);
return(NULL); return(NULL);
} }
filespec2_split = win32_splitter(dso, filespec2, 0); filespec2_split = win32_splitter(dso, filespec2, 1);
if (!filespec2_split) if (!filespec2_split)
{ {
DSOerr(DSO_F_WIN32_MERGER, DSOerr(DSO_F_WIN32_MERGER,

View File

@ -339,8 +339,8 @@ EOF
if ($no_static_engine) if ($no_static_engine)
{ {
$extra_install .= <<"EOF" $extra_install .= <<"EOF"
\$(MKDIR) \$(INSTALLTOP)${o}engines \$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
\$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}engines \$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
EOF EOF
} }
} }