Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage5 / pkg / texlive

diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive
index 8c4eda8..b5cbd59 100644 (file)
--- a/stage5/pkg/texlive
+++ b/stage5/pkg/texlive
@@ -15,10 +15,9 @@ hvconfig_pre()
 
     sed -i -e 's|PARENT/\.\./texmf-local|PARENT/texmf-local|' \
         -e 's|\$TEXMFVAR/fonts|/var/lib/livetex/fonts|'    \
-        ${LFS_TMP}/${PACKAGE}/texk/kpathsea/texmf.cnf
+        ${SRC_DIR}/texk/kpathsea/texmf.cnf
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-native-texlive-build \
         --enable-build-in-source-tree  \
         --without-luatex               \
@@ -34,8 +33,8 @@ hvconfig_pre()
 
 hvbuild_post()
 {
-    cp -a ${LFS_TMP}/${PACKAGE}/utils/biber/TeXLive /usr/lib/perl5/site_perl/${PERL}
-    ###cp -a ${LFS_TMP}/${PACKAGE}/utils/biber/TeXLive /usr/lib/perl5/site_perl/${PERL}/x86_64-linux-thread-multi
+    cp -a ${SRC_DIR}/utils/biber/TeXLive \
+        /usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})
 
     rm -v /usr/texmf{,-dist}
     install -v -m1777 -d /var/lib/livetex/fonts