romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 12:33:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix NetWare curlbuild.h

Browse source 
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
This commit is contained in:
Yang Tse 2008-08-10 18:33:41 +00:00
parent 6237fd2c16
commit 68cfe929c4
2 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/testcurl.pl
View file

@ -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 (<F>) {
print if /^ *#define/;
print if (($1 =~ /^ *#define/) && ($1 !~ /^ *#define.*__CURL_CURLBUILD_H/));
}
close(F);
}