From 68cfe929c4124fbf231aea04b17d81febd388ec6 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 10 Aug 2008 18:33:41 +0000 Subject: Fix NetWare curlbuild.h NetWare curlbuild.h settings depend on whether LIBC or CLIB is used. The NetWare specific Makefile is capable of knowing which target is being built. So, finally, the NetWare Makefile will take care of generating curlbuild.h --- tests/testcurl.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/testcurl.pl b/tests/testcurl.pl index a898eba3e..6342e8ac5 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -486,9 +486,15 @@ if ($configurebuild) { system("xcopy /s /q ..\\$CURLDIR ."); system("buildconf.bat"); } - elsif (($^O eq 'linux') || ($targetos =~ /netware/)) { - system("cp -afr ../$CURLDIR/* ."); - system("cp -af ../$CURLDIR/Makefile.dist Makefile"); + elsif ($targetos =~ /netware/) { + system("cp -afr ../$CURLDIR/* ."); + system("cp -af ../$CURLDIR/Makefile.dist Makefile"); + system("$make -i -C lib -f Makefile.netware prebuild"); + system("$make -i -C src -f Makefile.netware prebuild"); + } + elsif ($^O eq 'linux') { + system("cp -afr ../$CURLDIR/* ."); + system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -af ../$CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); system("$make -i -C lib -f Makefile.$targetos prebuild"); system("$make -i -C src -f Makefile.$targetos prebuild"); @@ -498,7 +504,7 @@ if ($configurebuild) { logit "display include/curl/curlbuild.h"; if(open(F, "include/curl/curlbuild.h")) { while () { - print if /^ *#define/; + print if (($1 =~ /^ *#define/) && ($1 !~ /^ *#define.*__CURL_CURLBUILD_H/)); } close(F); } -- cgit v1.2.3