diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 49126d6f0a..e8045338c6 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -236,7 +236,7 @@ tup.append_table(img_files, { {"KERNEL.MNT", "../kernel/trunk/kernel.mnt"}, {"@MENU", PROGS .. "/system/menu/trunk/menu"}, {"@VOLUME", PROGS .. "/media/volume/volume"}, - {"@PANEL", PROGS .. "/system/panel/trunk/@PANEL"}, + {"@PANEL", PROGS .. "/system/panel/trunk/PANEL"}, {"@DOCKY", PROGS .. "/system/docky/trunk/docky"}, {"@OPEN", PROGS .. "/system/open/open"}, {"@NOTIFY", PROGS .. "/system/notify3/notify"}, diff --git a/programs/system/panel/trunk/@PANEL.ASM b/programs/system/panel/trunk/PANEL.ASM similarity index 100% rename from programs/system/panel/trunk/@PANEL.ASM rename to programs/system/panel/trunk/PANEL.ASM diff --git a/programs/system/panel/trunk/Tupfile.lua b/programs/system/panel/trunk/Tupfile.lua index 3dc17460c5..1fea131976 100644 --- a/programs/system/panel/trunk/Tupfile.lua +++ b/programs/system/panel/trunk/Tupfile.lua @@ -1,3 +1,3 @@ if tup.getconfig("NO_FASM") ~= "" then return end tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) -tup.rule({"@PANEL.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "@PANEL") +tup.rule({"PANEL.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "PANEL") diff --git a/programs/system/panel/trunk/build_en.bat b/programs/system/panel/trunk/build_en.bat index b46a41bdfb..0e11918373 100644 --- a/programs/system/panel/trunk/build_en.bat +++ b/programs/system/panel/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix en >lang.inc -@fasm -m 16384 @panel.asm @panel +@fasm -m 16384 panel.asm panel @erase lang.inc -@kpack @panel +@kpack panel @pause \ No newline at end of file diff --git a/programs/system/panel/trunk/build_et.bat b/programs/system/panel/trunk/build_et.bat index 5bb6511472..dab642ba1f 100644 --- a/programs/system/panel/trunk/build_et.bat +++ b/programs/system/panel/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix et >lang.inc -@fasm -m 16384 @panel.asm @panel +@fasm -m 16384 panel.asm panel @erase lang.inc -@kpack @panel +@kpack panel @pause \ No newline at end of file diff --git a/programs/system/panel/trunk/build_ru.bat b/programs/system/panel/trunk/build_ru.bat index ce54027410..6ac0105ba5 100644 --- a/programs/system/panel/trunk/build_ru.bat +++ b/programs/system/panel/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix ru >lang.inc -@fasm -m 16384 @panel.asm @panel +@fasm -m 16384 panel.asm panel @erase lang.inc -@kpack @panel +@kpack panel @pause \ No newline at end of file diff --git a/programs/system/panel/trunk/makefile b/programs/system/panel/trunk/makefile index 2970745711..81a2df3548 100644 --- a/programs/system/panel/trunk/makefile +++ b/programs/system/panel/trunk/makefile @@ -4,7 +4,7 @@ FASM=/opt/bin/fasm KPACK=/opt/bin/kpack LANG=lang.inc -FILE=@PANEL +FILE=PANEL SOURCE=${FILE}.ASM OUT=${FILE}.bin