X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fconfigure-fonts;h=cfc35b3f48d7b3230a6a9e092a545f17dd408799;hb=16f1a75d215e027ad746fc60dd10cd456f07f8d6;hp=10cc8698e39fd1593aa4b6336de66d9f45ff968d;hpb=8682d21fc12f098f699a73b355b057c914b92505;p=hvlinux.git

diff --git a/stage4/configure-fonts b/stage4/configure-fonts
index 10cc869..cfc35b3 100755
--- a/stage4/configure-fonts
+++ b/stage4/configure-fonts
@@ -1,16 +1,13 @@
-#!/bin/sh
-set -o errexit
+#!/bin/bash
 
-# First argument of this script is the package name.
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
 
+# When all of the fonts have been installed, the system must be configured so
+# that Fontconfig can find the TrueType fonts since they are outside of the
+# default search path of /usr/share/fonts.
 install -v -d -m755 /usr/share/fonts
-ln -svfT ${XORG_PREFIX}/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF
-ln -svfT ${XORG_PREFIX}/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF
+ln -svfT /usr/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF
+ln -svfT /usr/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF
 
 X11_FONTS_DIR="/usr/share/fonts/X11"