fixed Win32 prebuild section; fixed minor cosmetic bug.

This commit is contained in:
Gunter Knauf 2004-07-06 02:37:52 +00:00
parent 842e4aaa0d
commit dd4d5bb1e0
1 changed files with 11 additions and 5 deletions

View File

@ -345,11 +345,11 @@ if ($gnulikebuild) {
mydie "configure didn't work"; mydie "configure didn't work";
} }
} else { } else {
if ($^O eq 'MSWin32') { if (($^O eq 'MSWin32') && ($targetos !~ /netware/)) {
system("xcopy /s /q ..\\$CURLDIR ."); system("xcopy /s /q ..\\$CURLDIR .");
system("buildconf.bat"); system("buildconf.bat");
} elsif ($^O eq 'linux') { } elsif (($^O eq 'linux') || ($targetos =~ /netware/)) {
system("cp -ar ../$CURLDIR/* ."); system("cp -afr ../$CURLDIR/* .");
system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -af ../$CURLDIR/Makefile.dist Makefile");
system("make -i -C lib -f Makefile.$targetos prebuild"); system("make -i -C lib -f Makefile.$targetos prebuild");
system("make -i -C src -f Makefile.$targetos prebuild"); system("make -i -C src -f Makefile.$targetos prebuild");
@ -387,9 +387,9 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
close(F); close(F);
if (-f "libcares$libext") { if (-f "libcares$libext") {
logit "ares is now built successfully (libcares.$libext)"; logit "ares is now built successfully (libcares$libext)";
} else { } else {
logit "ares build failed (libares.$libext)"; logit "ares build failed (libares$libext)";
} }
# cd back to the curl build dir # cd back to the curl build dir
@ -421,6 +421,12 @@ if ($gnulikebuild) {
close(F); close(F);
} }
if (-f "lib/libcurl$libext") {
logit "lib/libcurl was created fine (libcurl$libext)";
} else {
logit "lib/libcurl was not created (libcurl$libext)";
}
if (-f "src/curl$binext") { if (-f "src/curl$binext") {
logit "src/curl was created fine (curl$binext)"; logit "src/curl was created fine (curl$binext)";
} else { } else {