From bb845a71cacf01a7e90d2901e5f42e9ecaeda0f0 Mon Sep 17 00:00:00 2001
From: Ivan Baravy <dunkaist@gmail.com>
Date: Sat, 22 May 2021 19:09:11 +0000
Subject: [PATCH] Fix autobuild.

git-svn-id: svn://kolibrios.org@8724 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 drivers/disk/Tupfile.lua                                | 3 ++-
 programs/develop/libraries/console/examples/Tupfile.lua | 4 ++--
 programs/develop/libraries/dll/dll.asm                  | 2 +-
 programs/use_fasm.lua                                   | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/disk/Tupfile.lua b/drivers/disk/Tupfile.lua
index f52813abb7..8d3a88b15b 100644
--- a/drivers/disk/Tupfile.lua
+++ b/drivers/disk/Tupfile.lua
@@ -1,3 +1,4 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 ROOT = "../.."
-tup.rule("tmpdisk.asm", "fasm %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B.sys")
+tup.include(ROOT .. "/programs/use_fasm.lua")
+tup.rule("tmpdisk.asm", "fasm %f %o " .. PESTRIP_CMD .. tup.getconfig("KPACK_CMD"), "%B.sys")
diff --git a/programs/develop/libraries/console/examples/Tupfile.lua b/programs/develop/libraries/console/examples/Tupfile.lua
index 256db4c172..ad3c655f4c 100644
--- a/programs/develop/libraries/console/examples/Tupfile.lua
+++ b/programs/develop/libraries/console/examples/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
-tup.include(HELPERDIR .. "/use_fasm.lua")
 ROOT = "../../../../.."
-tup.foreach_rule("*.asm", FASM .. " %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B")
+tup.include(HELPERDIR .. "/use_fasm.lua")
+tup.foreach_rule("*.asm", FASM .. " %f %o " .. PESTRIP_CMD .. tup.getconfig("KPACK_CMD"), "%B")
diff --git a/programs/develop/libraries/dll/dll.asm b/programs/develop/libraries/dll/dll.asm
index f4e01b3432..f7835afecb 100644
--- a/programs/develop/libraries/dll/dll.asm
+++ b/programs/develop/libraries/dll/dll.asm
@@ -91,7 +91,7 @@ APP_STARTUP_THUNK:
 
 
 ; WARNING! This code must be after app initialization thunk!
-include '../../dll.inc'
+include '../../../dll.inc'
 align 4
 ;dd 0xdeadbeef
 dd APP_STARTUP_THUNK
diff --git a/programs/use_fasm.lua b/programs/use_fasm.lua
index c12b740b4d..92f692d12a 100644
--- a/programs/use_fasm.lua
+++ b/programs/use_fasm.lua
@@ -1,5 +1,6 @@
 INCLUDES = ""
 FASM_DEFAULT = "fasm"
+PESTRIP_CMD = string.gsub(tup.getconfig("PESTRIP_CMD"), "$(ROOT)", ROOT or "")
 
 function add_include(dir)
   if INCLUDES == ""