Merge pull request #467 from fosslinux/fix-preseed

Fix early-preseed (and environment variables generally)
fosslinux · May 10, 2024 · b988fb5 · b988fb5
2 parents f5eb51c + 6302bb6
commit b988fb5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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