X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Ftexlive;h=b5cbd59ba76d6de7570fadb629cd869cee68de7d;hb=2121ae9154ff063eef0defe0a9208663062a2d01;hp=8c4eda855b80a163ec47491c1e1bafe38f3a830c;hpb=d9702c4a5c6fbf2c738ffbf9c3563daf552c91d8;p=hvlinux.git

diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive
index 8c4eda8..b5cbd59 100644
--- 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