From 3dddd1c6878ab82316b9b1dc8dbd8898e6937934 Mon Sep 17 00:00:00 2001 From: vitalkrilov Date: Sun, 24 Apr 2022 15:05:38 +0000 Subject: [PATCH] added feature (which was expected to be) of custom HELPERDIR for some Tupfile's (btw there are still many files with same problem) git-svn-id: svn://kolibrios.org@9781 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/demos/kmatrix/trunk/Tupfile.lua | 6 ++---- programs/other/graph/branches/tcc_current/Tupfile.lua | 6 ++---- programs/system/shell/Tupfile.lua | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/programs/demos/kmatrix/trunk/Tupfile.lua b/programs/demos/kmatrix/trunk/Tupfile.lua index f275852cda..7520315ee4 100755 --- a/programs/demos/kmatrix/trunk/Tupfile.lua +++ b/programs/demos/kmatrix/trunk/Tupfile.lua @@ -1,8 +1,6 @@ if tup.getconfig("NO_TCC") ~= "" then return end -if tup.getconfig("HELPERDIR") == "" -then - HELPERDIR = "../../../../programs" -end + +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_tcc.lua") link_tcc("main.c", "kmatrix"); diff --git a/programs/other/graph/branches/tcc_current/Tupfile.lua b/programs/other/graph/branches/tcc_current/Tupfile.lua index 3d4d158c0f..e766b6d781 100755 --- a/programs/other/graph/branches/tcc_current/Tupfile.lua +++ b/programs/other/graph/branches/tcc_current/Tupfile.lua @@ -1,8 +1,6 @@ if tup.getconfig("NO_TCC") ~= "" then return end -if tup.getconfig("HELPERDIR") == "" -then - HELPERDIR = "../../../../../programs" -end + +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_tcc.lua") LIBS = "-lbox_lib" diff --git a/programs/system/shell/Tupfile.lua b/programs/system/shell/Tupfile.lua index cded93ee67..00d94fda5b 100644 --- a/programs/system/shell/Tupfile.lua +++ b/programs/system/shell/Tupfile.lua @@ -1,8 +1,6 @@ if tup.getconfig("NO_TCC") ~= "" then return end -if tup.getconfig("HELPERDIR") == "" -then - HELPERDIR = "../../../programs" -end + +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_tcc.lua") if tup.getconfig("LANG") == "ru"