X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-tetex;h=bd8ddb32b45076b350c7614deae241788f8d7a5c;hb=532a0d1a77242192d6809b03ec7c14e271e29e82;hp=79362ea59ca4b6f37c23071b35ef54bf4025baac;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-tetex b/stage3/cis-tetex
index 79362ea..bd8ddb3 100755
--- a/stage3/cis-tetex
+++ b/stage3/cis-tetex
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -7,17 +9,17 @@ source ../functions
 source ../packages-list
 
 # Removing any older directory from earlier attempt...
-rm -rf ${LFS_TMP}/cm-super &&
+rm -rf ${LFS_TMP}/cm-super
 
-install -v -m755 -d /usr/share/texmf &&
-decompress_package ${TETEX_TEXMF}    /usr/share/texmf &&
-decompress_package ${TETEX_TEXMFSRC} /usr/share/texmf &&
-decompress_package ${TETEX_CM_SUPER} &&
+install -v -m755 -d /usr/share/texmf
+decompress_package ${TETEX_TEXMF}    /usr/share/texmf
+decompress_package ${TETEX_TEXMFSRC} /usr/share/texmf
+decompress_package ${TETEX_CM_SUPER}
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --exec-prefix=/usr \
@@ -26,33 +28,36 @@ cd ${LFS_TMP}/${1}-build &&
     --without-texinfo \
     --with-system-ncurses \
     --with-system-zlib \
-    --disable-a4 &&
-make all &&
-make install &&
+    --with-system-t1lib \
+    --with-system-pnglib \
+    --with-system-gd \
+    --disable-a4
+make all
+make install
 
-texconfig-sys dvips paper letter &&
-texconfig-sys font rw &&
+texconfig-sys dvips paper letter
+texconfig-sys font rw
 
-install -v -d -m755 /usr/local/share/texmf/tex/latex &&
-var_add_path "TEXMFLOCAL" /etc/profile "/usr/local/share/texmf" &&
-var_export   "TEXMFLOCAL" /etc/profile &&
+install -v -d -m755 /usr/local/share/texmf/tex/latex
+var_add_path "TEXMFLOCAL" /etc/profile "/usr/local/share/texmf"
+var_export   "TEXMFLOCAL" /etc/profile
 
 # To install the optional cm-super fonts:
-FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN') &&
+FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN')
 mkdir -v -p ${FONTDIR}/fonts/afm/public/cm-super   \
     ${FONTDIR}/fonts/type1/public/cm-super \
     ${FONTDIR}/fonts/enc/dvips/cm-super    \
-    ${FONTDIR}/fonts/map/dvips/cm-super   &&
+    ${FONTDIR}/fonts/map/dvips/cm-super  
 
-cp -v ${LFS_TMP}/cm-super/pfb/*.pfb ${FONTDIR}/fonts/type1/public/cm-super/ &&
+cp -v ${LFS_TMP}/cm-super/pfb/*.pfb ${FONTDIR}/fonts/type1/public/cm-super/
 
-gunzip ${LFS_TMP}/cm-super/afm/* &&
-cp -v ${LFS_TMP}/cm-super/afm/*.afm ${FONTDIR}/fonts/afm/public/cm-super/ &&
+gunzip ${LFS_TMP}/cm-super/afm/*
+cp -v ${LFS_TMP}/cm-super/afm/*.afm ${FONTDIR}/fonts/afm/public/cm-super/
 
-cp -v ${LFS_TMP}/cm-super/dvips/*.enc ${FONTDIR}/fonts/enc/dvips/cm-super/ &&
-cp -v ${LFS_TMP}/cm-super/dvips/*.map ${FONTDIR}/fonts/map/dvips/cm-super/ &&
+cp -v ${LFS_TMP}/cm-super/dvips/*.enc ${FONTDIR}/fonts/enc/dvips/cm-super/
+cp -v ${LFS_TMP}/cm-super/dvips/*.map ${FONTDIR}/fonts/map/dvips/cm-super/
 
-cat >> ${FONTDIR}/web2c/updmap.cfg << "EOF" &&
+cat >> ${FONTDIR}/web2c/updmap.cfg << "EOF"
 MixedMap cm-super-t1.map
 MixedMap cm-super-t2a.map
 MixedMap cm-super-t2b.map
@@ -61,12 +66,11 @@ MixedMap cm-super-ts1.map
 MixedMap cm-super-x2.map
 EOF
 
-mktexlsr &&
+mktexlsr
 updmap-sys
 
 if [ ${?} -eq 0 ]; then
-    rm -rf ${LFS_TMP}/cm-super || exit 1
+    rm -rf ${LFS_TMP}/cm-super
 fi
 
-# Return last error
 exit $?