From 8797117c1d7cc7ca9d6c008e4b5f3e03f9a8b4ac Mon Sep 17 00:00:00 2001 From: turbocat Date: Fri, 30 Apr 2021 22:19:36 +0000 Subject: [PATCH] Whois: - Reconfiguring autobuild git-svn-id: svn://kolibrios.org@8706 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/network/whois/Makefile | 5 +++-- programs/network/whois/Tupfile.lua | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/network/whois/Makefile b/programs/network/whois/Makefile index 7bc52c5b88..0a24e30508 100755 --- a/programs/network/whois/Makefile +++ b/programs/network/whois/Makefile @@ -1,4 +1,5 @@ KTCC_DIR=../../develop/ktcc/trunk +KLIBC_DIR = ../../develop/libraries/kolibri-libc NAME=whois @@ -6,8 +7,8 @@ KTCC=$(KTCC_DIR)/bin/kos32-tcc KPACK=kpack SRC=whois.c -CFLAGS= -I $(KTCC_DIR)/kolibri-libc/include -LFLAGS= -nostdlib -L $(KTCC_DIR)/kolibri-libc $(KTCC_DIR)/kolibri-libc/crt0.o +CFLAGS= -I$(KLIBC_DIR)/include +LFLAGS= -nostdlib -L $(KLIBC_DIR)/lib $(KLIBC_DIR)/lib/crt0.o LIBS = -lnetwork -lc.obj all: diff --git a/programs/network/whois/Tupfile.lua b/programs/network/whois/Tupfile.lua index c122afccfc..f74530266a 100644 --- a/programs/network/whois/Tupfile.lua +++ b/programs/network/whois/Tupfile.lua @@ -2,8 +2,8 @@ if tup.getconfig("NO_TCC") ~= "" then return end TCC="kos32-tcc" -CFLAGS = "-I../../develop/ktcc/trunk/kolibri-libc/include" -LDFLAGS = "-nostdlib ../../develop/ktcc/trunk/kolibri-libc/crt0.o -L ../../develop/ktcc/trunk/kolibri-libc -L../../develop/ktcc/trunk/bin/lib " +CFLAGS = "-I../../develop/libraries/kolibri-libc/include" +LDFLAGS = "-nostdlib ../../develop/libraries/kolibri-libc/lib/crt0.o -L ../../develop/libraries/kolibri-libc/lib -L../../develop/ktcc/trunk/bin/lib " LIBS = "-lnetwork -lc.obj" COMMAND=string.format("%s %s %s %s %s ", TCC, CFLAGS, "%f -o %o", LDFLAGS, LIBS)