Ports: Replace hardcoded Build/ paths with SERENITY_BUILD_DIR

Fixes #5710.

29 files changed, 65 insertions, 74 deletions

diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh
index 7869769c44..b61700c16e 100755
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@@ -3,12 +3,13 @@ set -eu
 
 SCRIPT=`dirname $0`
 export SERENITY_ROOT=`realpath $SCRIPT/../`
-packagesdb="$SERENITY_ROOT/Build/packages.db"
-
+export SERENITY_ARCH=i686
+export SERENITY_BUILD_DIR="${SERENITY_ROOT}/Build/${SERENITY_ARCH}"
 export CC=i686-pc-serenity-gcc
 export CXX=i686-pc-serenity-g++
 export PATH=$SERENITY_ROOT/Toolchain/Local/i686/bin:$PATH
-export SERENITY_ARCH=i686
+
+packagesdb="${SERENITY_BUILD_DIR}/packages.db"
 
 MD5SUM=md5sum
 
@@ -161,7 +162,7 @@ func_defined build || build() {
     run make $makeopts
 }
 func_defined install || install() {
-    run make DESTDIR="$SERENITY_ROOT"/Build/Root $installopts install
+    run make DESTDIR="${SERENITY_BUILD_DIR}/Root" $installopts install
 }
 func_defined post_install || post_install() {
     echo
@@ -223,10 +224,10 @@ uninstall() {
             for f in `cat plist`; do
                 case $f in
                     */)
-                        run rmdir "$SERENITY_ROOT/Build/Root/$f" || true
+                        run rmdir "${SERENITY_BUILD_DIR}/Root/$f" || true
                         ;;
                     *)
-                        run rm -rf "$SERENITY_ROOT/Build/Root/$f"
+                        run rm -rf "${SERENITY_BUILD_DIR}/Root/$f"
                         ;;
                 esac
             done
diff --git a/Ports/ReadMe.md b/Ports/ReadMe.md
index dc242b8abd..45e98b9dc3 100644
--- a/Ports/ReadMe.md
+++ b/Ports/ReadMe.md
@@ -191,8 +191,8 @@ keyring and can later be used for verification using [`auth_opts`](#auth_opts).
 
 Options passed to `make install` in the default `install` function.
 
-`DESTDIR="$SERENITY_ROOT"/Build/Root` is always passed, override the `install`
-function if that's undesirable.
+`DESTDIR="${SERENITY_BUILD_DIR}/Root"` (`"${SERENITY_ROOT}/Build/${SERENITY_ARCH}/Root"`)
+is always passed, override the `install` function if that's undesirable.
 
 #### `makeopts`
 
diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh
index be7c60c70d..5cf90a99d0 100755
--- a/Ports/SDL2_mixer/package.sh
+++ b/Ports/SDL2_mixer/package.sh
@@ -8,8 +8,8 @@ depends="SDL2"
 
 configure() {
     run ./configure \
-        --host=${SERENITY_ARCH}-pc-serenity \
-        --with-sdl-prefix=${SERENITY_ROOT}/Build/Root/usr \
+        --host="${SERENITY_ARCH}-pc-serenity" \
+        --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
         EXTRA_LDFLAGS="-lgui -lgfx -lipc -lcore -lcompression"
 }
 
@@ -18,5 +18,5 @@ build() {
 }
 
 install() {
-    run make -k DESTDIR="$SERENITY_ROOT"/Build/Root install
+    run make -k DESTDIR="${SERENITY_BUILD_DIR}/Root" install
 }
diff --git a/Ports/SDL2_ttf/package.sh b/Ports/SDL2_ttf/package.sh
index 829d53bd6e..3856a4a4d1 100755
--- a/Ports/SDL2_ttf/package.sh
+++ b/Ports/SDL2_ttf/package.sh
@@ -8,7 +8,7 @@ depends="SDL2 freetype"
 
 configure() {
     run ./configure \
-        --host=${SERENITY_ARCH}-pc-serenity \
-        --with-sdl-prefix=${SERENITY_ROOT}/Build/Root/usr \
+        --host="${SERENITY_ARCH}-pc-serenity" \
+        --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
         LIBS="-lgui -lgfx -lipc -lcore -lcompress"
 }
diff --git a/Ports/bash/package.sh b/Ports/bash/package.sh
index 8d9a246a68..4447b3aefe 100755
--- a/Ports/bash/package.sh
+++ b/Ports/bash/package.sh
@@ -16,6 +16,6 @@ build() {
 }
 
 post_install() {
-    mkdir -p $SERENITY_ROOT/Build/Root/bin
-    ln -s /usr/local/bin/bash $SERENITY_ROOT/Build/Root/bin/bash
+    mkdir -p "${SERENITY_BUILD_DIR}/Root/bin"
+    ln -s /usr/local/bin/bash "${SERENITY_BUILD_DIR}/Root/bin/bash"
 }
diff --git a/Ports/binutils/package.sh b/Ports/binutils/package.sh
index e75808a5d9..6ee42cced5 100755
--- a/Ports/binutils/package.sh
+++ b/Ports/binutils/package.sh
@@ -2,7 +2,7 @@
 port=binutils
 version=2.32
 useconfigure=true
-configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=$SERENITY_ROOT/Build/Root --disable-werror --disable-gdb --disable-nls"
+configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_BUILD_DIR}/Root --disable-werror --disable-gdb --disable-nls"
 files="https://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.xz binutils-${version}.tar.xz
 https://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.xz.sig binutils-${version}.tar.xz.sig
 https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
diff --git a/Ports/bison/package.sh b/Ports/bison/package.sh
index 34fab542c5..1f284ea3c1 100755
--- a/Ports/bison/package.sh
+++ b/Ports/bison/package.sh
@@ -2,6 +2,6 @@
 port=bison
 version=1.25
 useconfigure=true
-configopts="--prefix=$SERENITY_ROOT/Build/Root/usr/local"
+configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
 files="https://ftp.gnu.org/gnu/bison/bison-${version}.tar.gz bison-${version}.tar.gz 65f577d0f8ffaf61ae21c23c0918d225"
 auth_type="md5"
diff --git a/Ports/build_installed.sh b/Ports/build_installed.sh
index 9b6f5d896a..8fbb4851fe 100755
--- a/Ports/build_installed.sh
+++ b/Ports/build_installed.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-packagesdb="$SERENITY_ROOT/Build/packages.db"
+packagesdb="${SERENITY_BUILD_DIR}/packages.db"
 
 clean=false
 case "$1" in
diff --git a/Ports/bzip2/package.sh b/Ports/bzip2/package.sh
index b2cc321da6..b4655442bc 100755
--- a/Ports/bzip2/package.sh
+++ b/Ports/bzip2/package.sh
@@ -4,4 +4,4 @@ version=1.0.8
 files="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz bzip2-${version}.tar.gz"
 workdir="bzip2-$version"
 makeopts="bzip2 CC=${CC}"
-installopts="PREFIX=${SERENITY_ROOT}/Build/Root/usr/local"
+installopts="PREFIX=${SERENITY_BUILD_DIR}/Root/usr/local"
diff --git a/Ports/c-ray/package.sh b/Ports/c-ray/package.sh
index 6f1352484e..bfafc3fed6 100755
--- a/Ports/c-ray/package.sh
+++ b/Ports/c-ray/package.sh
@@ -12,6 +12,6 @@ configure() {
 }
 
 install() {
-	mkdir -p $SERENITY_ROOT/Build/Root/home/anon/c-ray
-	cp -r c-ray-master/* $SERENITY_ROOT/Build/Root/home/anon/c-ray
+	mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray"
+	cp -r c-ray-master/* "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray"
 }
diff --git a/Ports/cmake/package.sh b/Ports/cmake/package.sh
index 05e211f69d..0b971bd2eb 100755
--- a/Ports/cmake/package.sh
+++ b/Ports/cmake/package.sh
@@ -12,7 +12,7 @@ build() {
 }
 
 install() {
-    cmake_dir="${SERENITY_ROOT}/Build/Root/home/anon/Source/cmake"
+    cmake_dir="${SERENITY_BUILD_DIR}/Root/home/anon/Source/cmake"
     run rm -rf "$cmake_dir"
     run mkdir -p "$cmake_dir"
     run cp -r . "$cmake_dir"
diff --git a/Ports/dmidecode/package.sh b/Ports/dmidecode/package.sh
index f22b492ab7..6aeda753b5 100755
--- a/Ports/dmidecode/package.sh
+++ b/Ports/dmidecode/package.sh
@@ -2,7 +2,6 @@
 port=dmidecode
 version=3.3
 useconfigure=false
-prefix=
 files="https://download.savannah.gnu.org/releases/dmidecode/dmidecode-${version}.tar.xz dmidecode-${version}.tar.xz
 https://download.savannah.gnu.org/releases/dmidecode/dmidecode-${version}.tar.xz.sig dmidecode-${version}.tar.xz.sig
 https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
@@ -16,9 +15,9 @@ install() {
 }
 
 post_install() {
-    mkdir -p $SERENITY_ROOT/Build/Root/bin
-    run make install-bin DESTDIR=$SERENITY_ROOT/Build/Root/
-    ln -s /usr/local/sbin/dmidecode $SERENITY_ROOT/Build/Root/bin/dmidecode
-    ln -s /usr/local/sbin/biosdecode $SERENITY_ROOT/Build/Root/bin/biosdecode
-    ln -s /usr/local/sbin/vpddecode $SERENITY_ROOT/Build/Root/bin/vpddecode
+    mkdir -p "${SERENITY_BUILD_DIR}/Root/bin"
+    run make install-bin DESTDIR="${SERENITY_BUILD_DIR}/Root"
+    ln -s /usr/local/sbin/dmidecode "${SERENITY_BUILD_DIR}/Root/bin/dmidecode"
+    ln -s /usr/local/sbin/biosdecode "${SERENITY_BUILD_DIR}/Root/bin/biosdecode"
+    ln -s /usr/local/sbin/vpddecode "${SERENITY_BUILD_DIR}/Root/bin/vpddecode"
 }
diff --git a/Ports/frotz/package.sh b/Ports/frotz/package.sh
index 250bbc66a4..630bcb50b9 100755
--- a/Ports/frotz/package.sh
+++ b/Ports/frotz/package.sh
@@ -7,8 +7,6 @@ depends="ncurses"
 
 build() {
     run make \
-        AR=i686-pc-serenity-ar \
-        RANLIB=i686-pc-serenity-ranlib \
         PKG_CONFIG_CURSES=no \
         CURSES_CFLAGS="-I${SERENITY_ROOT}/Build/Root/usr/local/include/ncurses" \
         CURSES_LDFLAGS="-lncurses -ltinfo" \
diff --git a/Ports/gcc/package.sh b/Ports/gcc/package.sh
index ef757db1ac..e48fb09d37 100755
--- a/Ports/gcc/package.sh
+++ b/Ports/gcc/package.sh
@@ -2,12 +2,12 @@
 port=gcc
 version=10.2.0
 useconfigure=true
-configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=$SERENITY_ROOT/Build/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared"
+configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_BUILD_DIR}/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared"
 files="https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz
 https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz.sig gcc-${version}.tar.xz.sig
 https://ftp.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 makeopts="all-gcc all-target-libgcc all-target-libstdc++-v3 -j $(nproc)"
-installopts="DESTDIR=$SERENITY_ROOT/Build/Root install-gcc install-target-libgcc install-target-libstdc++-v3"
+installopts="DESTDIR=${SERENITY_BUILD_DIR}/Root install-gcc install-target-libgcc install-target-libstdc++-v3"
 depends="binutils"
 auth_type="sig"
 auth_opts="--keyring ./gnu-keyring.gpg gcc-${version}.tar.xz.sig"
diff --git a/Ports/git/package.sh b/Ports/git/package.sh
index de4b7969ee..04b6c48973 100755
--- a/Ports/git/package.sh
+++ b/Ports/git/package.sh
@@ -12,8 +12,8 @@ build() {
 }
 
 post_install() {
-    mkdir -p "$SERENITY_ROOT"/Build/Root/home/anon
-    cp "$workdir"/../default_gitconfig "$SERENITY_ROOT"/Build/Root/home/anon/.gitconfig
+    run mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon"
+    run cp "../default_gitconfig" "${SERENITY_BUILD_DIR}/Root/home/anon/.gitconfig"
 }
 
 export NO_OPENSSL=1
diff --git a/Ports/gnuplot/package.sh b/Ports/gnuplot/package.sh
index 93e519d387..17a7eb4a71 100755
--- a/Ports/gnuplot/package.sh
+++ b/Ports/gnuplot/package.sh
@@ -4,7 +4,7 @@ version=5.2.8
 useconfigure=true
 # Note: gnuplot's source code is hosted on SourceForge, but using the GitHub mirror makes downloading a versioned .tar.gz easier.
 files="https://github.com/gnuplot/gnuplot/archive/${version}.tar.gz gnuplot-${version}.tar.gz"
-configopts="--prefix=$SERENITY_ROOT/Build/Root/usr/local --with-readline=builtin"
+configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local --with-readline=builtin"
 
 pre_configure() {
     run ./prepare
diff --git a/Ports/indent/package.sh b/Ports/indent/package.sh
index 5b54edf2c0..22cdc79793 100755
--- a/Ports/indent/package.sh
+++ b/Ports/indent/package.sh
@@ -8,9 +8,8 @@ useconfigure=true
 auth_type="sig"
 auth_opts="--keyring ./gnu-keyring.gpg indent-${version}.tar.gz.sig"
 
-man_dir=$SERENITY_ROOT/Build/Root/usr/local/share/man/man1/
-
 post_install() {
-    mkdir -p "${man_dir}"
-    cp "indent-${version}/man/indent.1" "${man_dir}"
+    man_dir="${SERENITY_BUILD_DIR}/Root/usr/local/share/man/man1/"
+    run mkdir -p "${man_dir}"
+    run cp man/indent.1 "${man_dir}"
 }
diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh
index 2832f09985..bfbb9d3bec 100755
--- a/Ports/lua/package.sh
+++ b/Ports/lua/package.sh
@@ -3,4 +3,4 @@ port=lua
 version=5.3.5
 files="http://www.lua.org/ftp/lua-5.3.5.tar.gz lua-5.3.5.tar.gz 4f4b4f323fd3514a68e0ab3da8ce3455"
 makeopts="-j$(nproc) serenity"
-installopts="INSTALL_TOP=$SERENITY_ROOT/Build/Root/usr/local"
+installopts="INSTALL_TOP=${SERENITY_BUILD_DIR}/Root/usr/local"
diff --git a/Ports/nano/package.sh b/Ports/nano/package.sh
index 78437e4262..aa54baf357 100755
--- a/Ports/nano/package.sh
+++ b/Ports/nano/package.sh
@@ -10,5 +10,5 @@ auth_type="sig"
 auth_import_key="BFD009061E535052AD0DF2150D28D4D2A0ACE884"
 auth_opts="nano-${version}.tar.xz.asc nano-${version}.tar.xz"
 
-export CPPFLAGS=-I${SERENITY_ROOT}/Build/Root/usr/local/include/ncurses
-export PKG_CONFIG_PATH=${SERENITY_ROOT}/Build/Root/usr/local/lib/pkgconfig
+export CPPFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include/ncurses"
+export PKG_CONFIG_PATH="${SERENITY_BUILD_DIR}/Root/usr/local/lib/pkgconfig"
diff --git a/Ports/ninja/package.sh b/Ports/ninja/package.sh
index 0a5b12c0c8..744ca5d65e 100755
--- a/Ports/ninja/package.sh
+++ b/Ports/ninja/package.sh
@@ -1,18 +1,18 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=ninja
 version=1.8.2
-workdir=ninja-1.8.2
-files="https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz ninja-v1.8.2.tar.gz"
+workdir="ninja-${version}"
+files="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz ninja-v${version}.tar.gz"
 
 build() {
-    CXX=i686-pc-serenity-g++ CXXFLAGS="--sysroot=${SERENITY_ROOT}/Build/Root" \
-    LDFLAGS="--sysroot=${SERENITY_ROOT}/Build/Root" \
+    CXX=i686-pc-serenity-g++ CXXFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
+    LDFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
     # platform=linux is close enough.
     run ./configure.py --bootstrap --platform=linux
-    strip "${workdir}/ninja"
+    run strip ninja
 }
 
 install() {
-    mkdir -p "${SERENITY_ROOT}/Build/Root/usr/local/bin"
-    cp "${workdir}/ninja" "${SERENITY_ROOT}/Build/Root/usr/local/bin/ninja"
+    run mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/local/bin"
+    run cp ninja "${SERENITY_BUILD_DIR}/Root/usr/local/bin/ninja"
 }
diff --git a/Ports/openssh/package.sh b/Ports/openssh/package.sh
index 4b5f0425ad..6a7a06471f 100755
--- a/Ports/openssh/package.sh
+++ b/Ports/openssh/package.sh
@@ -5,8 +5,7 @@ version=8.3-9ca7e9c
 files="https://github.com/openssh/openssh-portable/archive/9ca7e9c861775dd6c6312bc8aaab687403d24676.tar.gz openssh-8.3-9ca7e9c.tar.gz"
 depends="zlib openssl"
 useconfigure=true
-usr_local=$SERENITY_ROOT/Build/Root/usr/local/
-configopts="--prefix=/usr/local --disable-utmp --sysconfdir=/etc/ssh --with-ssl-dir=$usr_local/lib"
+configopts="--prefix=/usr/local --disable-utmp --sysconfdir=/etc/ssh --with-ssl-dir=${SERENITY_BUILD_DIR}/Root/usr/local/lib"
 
 pre_configure() {
 	run autoreconf
@@ -14,5 +13,5 @@ pre_configure() {
 
 install() {
 	# Can't make keys outside of Serenity since ssh-keygen is built for Serenity.
-	run make DESTDIR="$SERENITY_ROOT"/Build/Root $installopts install-nokeys
+	run make DESTDIR="${SERENITY_BUILD_DIR}/Root" $installopts install-nokeys
 }
diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh
index c0d76d945e..d7350ab08c 100755
--- a/Ports/openssl/package.sh
+++ b/Ports/openssl/package.sh
@@ -11,8 +11,7 @@ auth_import_key="8657ABB260F056B1E5190839D9C4D26D0E604491"
 auth_opts="openssl-${version}.tar.gz.asc openssl-${version}.tar.gz"
 
 depends="zlib"
-usr_local=$SERENITY_ROOT/Build/Root/usr/local/
-configopts="--prefix=$usr_local -DOPENSSL_SYS_SERENITY=1 --openssldir=$usr_local/ssl BSD-x86 zlib no-tests no-threads no-asm"
+configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local -DOPENSSL_SYS_SERENITY=1 --openssldir=${SERENITY_BUILD_DIR}/Root/usr/local/ssl BSD-x86 zlib no-tests no-threads no-asm"
 
 configure() {
     run rm -rf ./test/
diff --git a/Ports/pkgconf/package.sh b/Ports/pkgconf/package.sh
index d1a6d0be80..0940cefdbb 100755
--- a/Ports/pkgconf/package.sh
+++ b/Ports/pkgconf/package.sh
@@ -3,10 +3,11 @@ port=pkgconf
 version=1.7.3
 files="https://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.3.tar.xz pkgconf-1.7.3.tar.xz"
 useconfigure=true
-usr_local=$SERENITY_ROOT/Build/Root/usr/local/
+# FIXME: This looks suspiciously host-y... 
 configopts="--prefix=/usr/local --with-pkg-config-dir=/usr/local/lib/pkgconfig"
 
 post_install() {
-    mkdir -p $SERENITY_ROOT/Build/Root/bin
-    ln -sf /usr/local/bin/pkgconf $SERENITY_ROOT/Build/Root/usr/local/bin/pkg-config
+    run mkdir -p "${SERENITY_BUILD_DIR}/Root/bin"
+    # FIXME: Same here, what is this about?!
+    run ln -sf /usr/local/bin/pkgconf "${SERENITY_BUILD_DIR}/Root/usr/local/bin/pkg-config"
 }
diff --git a/Ports/python3/Setup.local b/Ports/python3/Setup.local
index 2f7a988157..124069254b 100644
--- a/Ports/python3/Setup.local
+++ b/Ports/python3/Setup.local
@@ -29,7 +29,7 @@ _codecs_tw cjkcodecs/_codecs_tw.c
 _contextvars _contextvarsmodule.c
 _crypt _cryptmodule.c
 _csv _csv.c
-_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/cfield.c _ctypes/malloc_closure.c _ctypes/stgdict.c -I$(SERENITY_ROOT)/Build/Root/usr/local/include $(SERENITY_ROOT)/Build/Root/usr/local/lib/libffi.a
+_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/cfield.c _ctypes/malloc_closure.c _ctypes/stgdict.c -I$(SERENITY_BUILD_DIR)/Root/usr/local/include $(SERENITY_BUILD_DIR)/Root/usr/local/lib/libffi.a
 _datetime _datetimemodule.c
 _elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c
 _heapq _heapqmodule.c
@@ -64,7 +64,7 @@ syslog syslogmodule.c
 unicodedata unicodedata.c
 xxlimited xxlimited.c
 xxsubtype xxsubtype.c
-zlib zlibmodule.c -I$(SERENITY_ROOT)/Build/Root/usr/local/include -L$(SERENITY_ROOT)/Build/Root/usr/local/lib -lz
+zlib zlibmodule.c -I$(SERENITY_BUILD_DIR)/Root/usr/local/include -L$(SERENITY_BUILD_DIR)/Root/usr/local/lib -lz
 
 *disabled*
 # Not building, patch Python some more or fix LibC...
@@ -74,4 +74,4 @@ _decimal _socket mmap resource spwd termios
 _lsprof _multiprocessing
 
 # Lots and lots of linker errors, although these flags should be correct:
-_curses _cursesmodule.c -I$(SERENITY_ROOT)/Build/Root/usr/local/include/ncurses -L$(SERENITY_ROOT)/Build/Root/usr/local/lib -lncurses -ltermcap
+_curses _cursesmodule.c -I$(SERENITY_BUILD_DIR)/Root/usr/local/include/ncurses -L$(SERENITY_BUILD_DIR)/Root/usr/local/lib -lncurses -ltermcap
diff --git a/Ports/quake/package.sh b/Ports/quake/package.sh
index bd0c43ad89..2185706566 100755
--- a/Ports/quake/package.sh
+++ b/Ports/quake/package.sh
@@ -7,4 +7,5 @@ files="https://github.com/SerenityOS/SerenityQuake/archive/master.tar.gz quake.t
 makeopts="V=1 SYMBOLS_ON=Y "
 depends=SDL2
 
-export PATH=${SERENITY_ROOT}/Build/Root/usr/bin:$PATH
+# FIXME: Uhh, the things in this directory are not supposed to run on the host, why add this to $PATH?!
+export PATH="${SERENITY_BUILD_DIR}/Root/usr/bin:${PATH}"
diff --git a/Ports/sl/package.sh b/Ports/sl/package.sh
index 6b55fe8c20..5f65a08a7e 100755
--- a/Ports/sl/package.sh
+++ b/Ports/sl/package.sh
@@ -6,11 +6,5 @@ files="https://github.com/mtoyoda/sl/archive/master.tar.gz sl-git.tar.gz"
 depends="ncurses"
 
 build() {
-    run ${CC} -I${SERENITY_ROOT}/Build/Root/usr/local/include/ncurses -L${SERENITY_ROOT}/Build/Root/usr/local/lib -o sl sl.c -lncurses -ltinfo
-}
-
-post_install() {
-    # Dirty hack that seems to be necessary to make ncurses play nice
-    mkdir -p ${SERENITY_ROOT}/Build/Root/usr/local/share/terminfo/x
-    cp ${SERENITY_ROOT}/Build/Root/usr/local/share/terminfo/78/xterm ${SERENITY_ROOT}/Build/Root/usr/local/share/terminfo/x/
+    run ${CC} -I${SERENITY_BUILD_DIR}/Root/usr/local/include/ncurses -L${SERENITY_BUILD_DIR}/Root/usr/local/lib -o sl sl.c -lncurses -ltinfo
 }
diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh
index 7c83ac9c56..ace00106c0 100755
--- a/Ports/stress-ng/package.sh
+++ b/Ports/stress-ng/package.sh
@@ -3,4 +3,4 @@ port=stress-ng
 version=0.11.23
 workdir=stress-ng-${version}
 files="https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz stress-ng-${version}.tar.gz"
-makeopts="STATIC=1 LDFLAGS=-L${SERENITY_ROOT}/Build/Root/usr/local/lib"
+makeopts="STATIC=1 LDFLAGS=-L${SERENITY_BUILD_DIR}/Root/usr/local/lib"
diff --git a/Ports/termcap/package.sh b/Ports/termcap/package.sh
index b54eae7667..f25b707465 100755
--- a/Ports/termcap/package.sh
+++ b/Ports/termcap/package.sh
@@ -2,5 +2,5 @@
 port=termcap
 version=1.3.1
 useconfigure=true
-configopts="--prefix=$SERENITY_ROOT/Build/Root/usr"
+configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr"
 files="https://ftp.gnu.org/gnu/termcap/termcap-${version}.tar.gz termcap-${version}.tar.gz"
diff --git a/Ports/tinyscheme/package.sh b/Ports/tinyscheme/package.sh
index 711f0d4397..68d23e59a0 100755
--- a/Ports/tinyscheme/package.sh
+++ b/Ports/tinyscheme/package.sh
@@ -10,8 +10,8 @@ build() {
 }
 
 install() {
-    run mkdir -p "${SERENITY_ROOT}/Build/Root/usr/local/bin"
-    run cp scheme "${SERENITY_ROOT}/Build/Root/usr/local/bin/tinyscheme"
-    run mkdir -p "${SERENITY_ROOT}/Build/Root/usr/local/include/tinyscheme"
-    run cp init.scm "${SERENITY_ROOT}/Build/Root/usr/local/include/tinyscheme/init.scm"
+    run mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/local/bin"
+    run cp scheme "${SERENITY_BUILD_DIR}/Root/usr/local/bin/tinyscheme"
+    run mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/local/include/tinyscheme"
+    run cp init.scm "${SERENITY_BUILD_DIR}/Root/usr/local/include/tinyscheme/init.scm"
 }