From b74ad71d18c511a7c7f29fad9372e80411e3a37d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 4 Feb 2011 14:24:13 +0100
Subject: [PATCH] config/path: remove not more needed variables
 $XORG_PATH_FONTS, $XORG_PATH_MAPS and $XORG_PATH_ENCODINGS

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/path                            | 3 ---
 packages/x11/other/fontconfig/build    | 2 +-
 packages/x11/xserver/xorg-server/build | 7 +++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/path b/config/path
index 7441e58b52..1fb3ccbb0e 100644
--- a/config/path
+++ b/config/path
@@ -85,9 +85,6 @@ SED="sed -i"
   [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
   [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
 
-XORG_PATH_ENCODINGS=/usr/share/X11/encodings
-XORG_PATH_FONTS=/usr/share/X11/fonts
-XORG_PATH_MAPS=$XORG_PATH_FONTS/util
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
 XORG_PATH_XKB_OUTPUT=/var/lib/xkb
diff --git a/packages/x11/other/fontconfig/build b/packages/x11/other/fontconfig/build
index 3424b14b64..12aeeb36ea 100755
--- a/packages/x11/other/fontconfig/build
+++ b/packages/x11/other/fontconfig/build
@@ -36,7 +36,7 @@ cd $PKG_BUILD
             --enable-shared \
             --with-arch=$TARGET_ARCH \
             --with-freetype-config=$ROOT/$TOOLCHAIN/bin/freetype-config \
-            --with-default-fonts=$XORG_PATH_FONTS/liberation \
+            --with-default-fonts=/usr/share/fonts/liberation \
             --without-add-fonts \
             --disable-dependency-tracking \
             --disable-docs
diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 20a1c8cd31..49faec5032 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -103,9 +103,8 @@ cd $PKG_BUILD
             --with-xkb-output=/var/cache/xkb \
             --with-log-dir=/var/log \
             --with-dri-driver-path=$XORG_PATH_DRI \
-            --with-fontrootdir=$XORG_PATH_FONTS \
-            --with-default-font-path="$XORG_PATH_FONTS/misc,built-ins"
+            --with-fontrootdir=/usr/share/fonts \
+            --with-default-font-path="/usr/share/fonts/misc,built-ins"
 
 make
-
-make DESTDIR=$SYSROOT_PREFIX install
+$MAKEINSTALL
\ No newline at end of file