From 30de08ace61b69951c311578cf6c72c18941660d Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Fri, 12 Sep 2014 16:22:57 +0000 Subject: [PATCH] small fix git-svn-id: svn://kolibrios.org@5102 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index bc18cd017c..503f4a38b4 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -581,17 +581,11 @@ tup.definerule{inputs = input_deps, command = outputs = {"kolibri.iso"}} -- generate command and dependencies for distribution kit -input_deps = {"kolibri.img"} -output_deps = {"distribution_kit/kolibri.img"} -make_distr_command = "ln -sr kolibri.img distribution_kit/kolibri.img" +cp = "cp %f %o" +tup.definerule{inputs = {"kolibri.img"}, command = cp, outputs = {"distribution_kit/kolibri.img"}} for i,v in ipairs(distr_extra_files) do - make_distr_command = make_distr_command .. ' && ln -sr "`realpath "' .. v[2] .. '"`" "distribution_kit/' .. v[1] .. '"' - table.insert(input_deps, v[2]) if string.sub(v[1], -1) == "/" - then table.insert(output_deps, "distribution_kit/" .. v[1] .. tup.file(v[2])) - else table.insert(output_deps, "distribution_kit/" .. v[1]) + then tup.definerule{inputs = v[2], command = cp, outputs = {"distribution_kit/" .. v[1] .. tup.file(v[2])}} + else tup.definerule{inputs = v[2], command = cp, outputs = {"distribution_kit/" .. v[1]}} end end - --- generate tup rule for distribution kit -tup.definerule{inputs = input_deps, command = make_distr_command, outputs = output_deps}