Menage fonts

[hvlinux.git] / stage3 / cis-fontconfig

diff --git a/stage3/cis-fontconfig b/stage3/cis-fontconfig
index 6d613d5..fd696a2 100755 (executable)
--- a/stage3/cis-fontconfig
+++ b/stage3/cis-fontconfig
@@ -2,34 +2,37 @@
 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
+    --localstatedir=/var \
+    --disable-docs \
+    --without-add-fonts \
+    --with-docdir=/usr/share/doc/${PACKAGE} \
+    ${CONFIGURE_OPTS}
 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
+ldconfig
 
 mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1}
 mkdir -v -p /etc/fonts
@@ -46,8 +49,6 @@ cat > /etc/fonts/local.conf << "EOF"
 <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