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

diff --git a/stage3/cis-fontconfig b/stage3/cis-fontconfig
index d0bdead..fd696a2 100755
--- a/stage3/cis-fontconfig
+++ b/stage3/cis-fontconfig
@@ -2,29 +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
@@ -41,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