Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / perl

diff --git a/stage2/pkg/perl b/stage2/pkg/perl
index 69cf777..d1f11cf 100644 (file)
--- a/stage2/pkg/perl
+++ b/stage2/pkg/perl
@@ -2,43 +2,26 @@
 
 hvconfig_pre()
 {
-    if [ "x${HVLABEL}" = "x${PERL}-pass1" ]; then
-        # Change a hardcoded path from /usr/include to /tools/include:
-        sed 's@/usr/include@/tools/include@g' \
-            -i ${LFS_TMP}/${PACKAGE}/ext/Errno/Errno_pm.PL
+    # 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 -e '/^BUILD_ZLIB/s/True/False/' \
+        -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+        -e '/^LIB/s,\./zlib-src,/usr/lib,' \
+        -i ${SRC_DIR}/cpan/Compress-Raw-Zlib/config.in
 
-        CONFIGURE_OPTS="\
-            --prefix=/tools \
-            -Dcc=gcc"
-    else
-        # 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 -e '/^BUILD_ZLIB/s/True/False/' \
-            -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
-            -e '/^LIB/s,\./zlib-src,/usr/lib,' \
-            -i ${LFS_TMP}/${PACKAGE}/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"
-    fi
+    CONFIGURE_OPTS="\
+        --prefix=/usr \
+        -Dvendorprefix=/usr \
+        -Dman1dir=/usr/share/man/man1 \
+        -Dman3dir=/usr/share/man/man3 \
+        -Dpager='/bin/less -isR' \
+        -Dusethreads \
+        -Duseshrplib"
 }
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
     ./configure.gnu ${CONFIGURE_OPTS}
 }
-
-hvbuild_post()
-{
-    if [ "x${HVLABEL}" = "x${PERL}-pass1" ]; then
-        ln -svfT /tools/bin/perl /usr/bin/perl
-    fi
-}