Changeset 8c8c5ab for scripts

Timestamp:

Feb 21, 2006, 12:22:21 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

d3d48d51

Parents:

c2b8e07

Message:

r596@server (orig r594): ryan | 2005-08-05 23:10:34 -0700
Update for new version, add support for optional deps if they are detected

File:

• scripts/untested/blfs-scripts/blfs-tex.sh (modified) (3 diffs)

scripts/untested/blfs-scripts/blfs-tex.sh

@@ -19 +19 @@
 mkdir -p /usr/share/texmf
 cd /usr/share/texmf
-unpack_tarball tetex-texmf-${TETEX_VER}
-unpack_tarball tetex-texmfsrc-${TETEX_VER}
+( 
+   umask 0 
+   umask
+   unpack_tarball tetex-texmf-${TETEX_VER}
+   unpack_tarball tetex-texmfsrc-${TETEX_VER}
+)
 
+umask
 PKGDIR=${OLD_PKGDIR}
 
 cd ${SRC}/${PKGDIR}
 
-apply_patch tetex-src-2.0.2-flex-1
-apply_patch tetex-src-2.0.2-remove_readlink-1
+case ${TETEX_VER} in
+   2.0.2 )
+      apply_patch tetex-src-2.0.2-flex-1
+      apply_patch tetex-src-2.0.2-remove_readlink-1
+   ;;
+esac
 
+# Additional config if t1lib, gd were built previously
+if [ -f /usr/${libdirname}/libt1.a ]; then
+   extra_conf="${extra_conf} --with-system-t1lib"
+fi
+
+if [ -f /usr/${libdirname}/libgd.a ]; then
+   extra_conf="${extra_conf} --with-system-gd"
+fi
+
+# Added LDFLAGS to appease libtool w gdlib
 max_log_init tetex ${TETEX_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
@@ -34 +53 @@
 CFLAGS="${TGT_CFLAGS}" \
 CXXFLAGS="${TGT_CFLAGS}" \
+LDFLAGS="-L/usr/${libdirname}" \
 ./configure --prefix=/usr \
    --with-system-ncurses --with-system-zlib \
@@ -41 +61 @@
 echo " o Configure OK" &&
 
+# TODO: check whether we should use make world or make all.
+#       2.0.2 instructions were make world
 min_log_init ${BUILDLOGS} &&
-make world \
+make all \
    >> ${LOGFILE} 2>&1 &&
 echo " o Build OK" || barf
 
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
 texconfig dvips paper a4
 texconfig font rw