Fini la mise à jour pour répertoire pkg. Stage4 compile OK et driver xorg nouveau OK

[hvlinux.git] / stage4 / configure-fonts

diff --git a/stage4/configure-fonts b/stage4/configure-fonts
index eab4954..9b0caf4 100755 (executable)
--- a/stage4/configure-fonts
+++ b/stage4/configure-fonts
@@ -1,19 +1,15 @@
-#!/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 ../config/sysinfos
 source ../functions
-source ../packages-list
+source ../config/packages-list
 
 # 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"