Reintroduce temporary perl at beginning of stage2

[hvlinux.git] / stage2 / pkg / perl

diff --git a/stage2/pkg/perl b/stage2/pkg/perl
index 79c19a8..85d79f5 100644 (file)
--- a/stage2/pkg/perl
+++ b/stage2/pkg/perl
@@ -4,8 +4,8 @@ hvconfig_pre()
 {
     if [ "x${HVLABEL}" = "x${PERL}-pass1" ]; then
         # Change a hardcoded path from /usr/include to /tools/include:
-        sed -i 's@/usr/include@/tools/include@g' \
-            ${LFS_TMP}/${PACKAGE}/ext/Errno/Errno_pm.PL
+        sed 's@/usr/include@/tools/include@g' \
+            -i ${LFS_TMP}/${PACKAGE}/ext/Errno/Errno_pm.PL
 
         CONFIGURE_OPTS="\
             --prefix=/tools \
@@ -14,24 +14,25 @@ hvconfig_pre()
         # By default, Perl's Compress::Raw::Zlib module builds and links against
         # its own internal copy of Zlib. The following command will tell it to
         # use the system-installed Zlib:
-        sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+        sed -e '/^BUILD_ZLIB/s/True/False/' \
             -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
             -e '/^LIB/s,\./zlib-src,/usr/lib,' \
-            ${LFS_TMP}/${PACKAGE}/cpan/Compress-Raw-Zlib/config.in
+            -i ${SRC_DIR}/cpan/Compress-Raw-Zlib/config.in
 
         CONFIGURE_OPTS="\
             --prefix=/usr \
             -Dvendorprefix=/usr \
             -Dman1dir=/usr/share/man/man1 \
             -Dman3dir=/usr/share/man/man3 \
-            -Dpager=\"/bin/less -isR\" \
-            -Dusethreads -Duseshrplib"
+            -Dpager='/bin/less -isR' \
+            -Dusethreads \
+            -Duseshrplib"
     fi
 }
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
     ./configure.gnu ${CONFIGURE_OPTS}
 }