Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / glibc

diff --git a/stage2/pkg/glibc b/stage2/pkg/glibc
index b98c282..2b51e32 100644 (file)
--- a/stage2/pkg/glibc
+++ b/stage2/pkg/glibc
@@ -11,8 +11,6 @@ hvconfig_pre()
         --enable-obsolete-rpc \
         --libexecdir=/usr/lib/glibc"
 
-    cd ${LFS_TMP}/${PACKAGE}
-
     # When running make install, a script called test-installation.pl performs a
     # small sanity test on our newly installed Glibc. However, because our
     # toolchain still points to the /tools directory, the sanity test would be
@@ -21,15 +19,13 @@ hvconfig_pre()
     LINKER=$(readelf -l /tools/bin/bash | \
         sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
-        scripts/test-installation.pl
+        ${SRC_DIR}/scripts/test-installation.pl
     unset LINKER
 
-    cd ${LFS_TMP}/${PACKAGE}-build
-
     case "${HVL_TARGET}" in
         "x86_64")
             # Tell glibc to install its libraries into /lib:
-            echo "slibdir=/lib" >> configparms
+            echo "slibdir=/lib" >> ${BUILD_DIR}/configparms
             CONFIGURE_OPTS+=" --libdir=/usr/lib"
            ;;
     esac
@@ -73,7 +69,7 @@ hvbuild()
     esac
 
     # Install the configuration file and runtime directory for nscd:
-    cp -v ${LFS_TMP}/${PACKAGE}/nscd/nscd.conf /etc/nscd.conf
+    cp -v ${SRC_DIR}/nscd/nscd.conf /etc/nscd.conf
     mkdir -pv /var/cache/nscd
 
     # The following instructions, instead of the install-locales target