From 126f61496aaf25f329350a444139fa406c95fd22 Mon Sep 17 00:00:00 2001
From: Denis Benato <benato.denis96@gmail.com>
Date: Sun, 8 Dec 2024 21:27:16 +0100
Subject: [PATCH] bzip2 puts stuff everywhere -.-

---
 build.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index fb61e0d..c5af1b8 100755
--- a/build.sh
+++ b/build.sh
@@ -124,11 +124,10 @@ host_toolchain() {
 
 # Create a directory layout
 if [ ! -d "$LFS/etc" ]; then
-    mkdir -pv $LFS/{etc,var} $LFS/usr/{bin,lib,sbin}
-
+    mkdir -pv $LFS/{etc,var} $LFS/usr/{bin,lib,sbin,libexec,share}
     mkdir -pv $LFS/{dev,proc,sys,run,tmp}
 
-    for i in bin lib sbin; do
+    for i in bin lib sbin libexec; do
         ln -sv usr/$i $LFS/$i
     done
 fi
@@ -516,7 +515,7 @@ if [ ! -f "$STEPS_DIR/attr" ]; then
     echo "rootsbindir=/usr/sbin" > configparms
 
     "../configure"                        \
-        --prefix=/usr                     \
+        --prefix=/                        \
         --disable-static                  \
         --host=$LFS_TGT
     
@@ -620,7 +619,7 @@ if [ ! -f "$STEPS_DIR/bzip2" ]; then
     cd "$LFS_BUILD/bzip2"
 
     #make 
-    make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" -j 32  PREFIX=$LFS install
+    make CC="${CC} ${CFLAGS}" AR="${AR}" RANLIB="${RANLIB}" LD="${LD} ${LDFLAGS}" -j 32  PREFIX=$LFS install
 
     if [ -f "$LFS/bin/bzip2" ]; then
         "$LFS_TGT-strip" --strip-unneeded "$LFS/bin/bzip2"
@@ -629,6 +628,9 @@ if [ ! -f "$STEPS_DIR/bzip2" ]; then
         exit 1
     fi
 
+    # Remove useless doc out of dir
+    rm -rf "$LFS/man"
+
     cd "$BASE_DIR"
     rm -rf "$LFS_BUILD/bzip2"
     touch "$STEPS_DIR/bzip2"
@@ -776,9 +778,12 @@ if [ ! -f "$STEPS_DIR/gawk" ]; then
     cd        build-$LFS_TGT
 
     "../configure"                       \
-        --prefix=$LFS                    \
+        --prefix=$LFS/usr                \
+        --libexecdir=$LFS/usr/lib        \
+        --sysconfdir=$LFS/etc            \
         --host=${LFS_TGT}                \
         --build=${BUILD_MACHINE_TRIPLET} \
+        --without-libsigsegv             \
         --cache-file=config.cache
 
     make -j 32
@@ -1107,6 +1112,8 @@ if [ ! -f "$STEPS_DIR/acl" ]; then
 
     "../configure"                       \
         --prefix=/usr                    \
+        --libexecdir=/usr/libexec        \
+        --libdir=/usr/lib                \
         --host=${LFS_TGT}                \
         --build=${BUILD_MACHINE_TRIPLET} \
         --with-sysroot=$LFS              \