From 6302bb6d207ff2dfb199f3e97a05e0c7827f34cb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 10 May 2024 12:18:24 +1000
Subject: [PATCH] Fix early-preseed (and environment variables generally)

---
 steps/heirloom-devtools-070527/pass1.sh |  3 +--
 steps/improve/update_env.sh             | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/steps/heirloom-devtools-070527/pass1.sh b/steps/heirloom-devtools-070527/pass1.sh
index db9c7808..04b49d61 100644
--- a/steps/heirloom-devtools-070527/pass1.sh
+++ b/steps/heirloom-devtools-070527/pass1.sh
@@ -8,7 +8,7 @@
 
 src_compile() {
     cd lex
-    make -f Makefile.mk CC=tcc AR=tcc\ -ar LDFLAGS=-static RANLIB=true
+    make -f Makefile.mk CC=tcc AR="tcc -ar" LDFLAGS=-static RANLIB=true LIBDIR="${LIBDIR}"
     cd ..
 }
 
@@ -18,4 +18,3 @@ src_install() {
     install lex/libl.a "${DESTDIR}${LIBDIR}"
     install -m 644 lex/ncform "${DESTDIR}${LIBDIR}/lex"
 }
-
diff --git a/steps/improve/update_env.sh b/steps/improve/update_env.sh
index 89ccfcee..8cdc8d8e 100755
--- a/steps/improve/update_env.sh
+++ b/steps/improve/update_env.sh
@@ -21,4 +21,15 @@ export SHELL=/usr/bin/bash
 DESTDIR=/tmp/destdir
 EOF
 
+# The following values are set up in the kaem environment.
+# As these are then passed through to the bash shell, they are considered
+# automatically exported variables. We don't want them exported.
+unset PREFIX
+unset BINDIR
+unset LIBDIR
+unset INCDIR
+unset SRCDIR
+unset TMPDIR
+unset DISTFILES
+
 . /steps/env