X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-fontconfig;h=fd696a276e1b46ef60c69afd7ac4ab4cd9d14974;hb=00e8a130828a360dd654ff76cade992d846fc059;hp=b2e1e0db454b0d0f75549926b75d32c6254dcc42;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-fontconfig b/stage3/cis-fontconfig
index b2e1e0d..fd696a2 100755
--- a/stage3/cis-fontconfig
+++ b/stage3/cis-fontconfig
@@ -1,53 +1,60 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name.
+# Remaining arguments are additional configure options.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
 source ../packages-list
 
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
+if [ -z "${HV_FONTS_PATH}" ]; then
+    echo "Missing HV_FONTS_PATH environment variable"
+    exit 1
+fi
+
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
 
-cd ${LFS_TMP}/${1}-build &&
-../${1}/configure \
+cd ${LFS_TMP}/${PACKAGE}-build
+../${PACKAGE}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --disable-docs &&
-make &&
-make install &&
-# Manually installing documentation.
-cd ${LFS_TMP}/${1} &&
-install -v -m644 doc/*.3 /usr/share/man/man3 &&
-install -v -m644 doc/*.5 /usr/share/man/man5 &&
-install -v -m755 -d /usr/share/doc/${1}/fontconfig-devel &&
-install -v -m644 doc/*.{html,pdf,txt} /usr/share/doc/${1} &&
-install -v -m644 doc/fontconfig-devel/* /usr/share/doc/${1}/fontconfig-devel &&
-
-mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1} &&
-mkdir -v -p /etc/fonts &&
+    --localstatedir=/var \
+    --disable-docs \
+    --without-add-fonts \
+    --with-docdir=/usr/share/doc/${PACKAGE} \
+    ${CONFIGURE_OPTS}
+make
+make install
+ldconfig
+
+mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1}
+mkdir -v -p /etc/fonts
 
 if [ -f /etc/fonts/local.conf ]; then
-    mv -v /etc/fonts/local.conf /etc/fonts/local.conf.old || exit 1
-fi &&
+    mv -v /etc/fonts/local.conf /etc/fonts/local.conf.old
+fi
 
 # Adding X and our local fonts directory to local configuration file
-cat > /etc/fonts/local.conf << "EOF" &&
+cat > /etc/fonts/local.conf << "EOF"
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/local.conf file for local customizations -->
 <fontconfig>
     <dir>_HV_FONTS_PATH_/TrueType</dir>
     <dir>_HV_FONTS_PATH_/Type1</dir>
-    <dir>/usr/X11R6/lib/X11/fonts</dir>
-<dir>/usr/share/fonts/ghostscript</dir>
 </fontconfig>
 EOF
 
-sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/fonts/local.conf &&
+sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/fonts/local.conf
 
 # Updating cache database.
 fc-cache -f
 
-# Return last error
 exit $?