From ccf99acf63fb4ff798996b43f44fe2069ecc6483 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 4 Feb 2011 14:13:16 +0100
Subject: [PATCH] font-bitstream-type1: using 'fontrootdir=/usr/share/fonts',
 rework of build and install scripts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/font/font-bitstream-type1/build   |  8 +-------
 packages/x11/font/font-bitstream-type1/install | 10 ++++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/x11/font/font-bitstream-type1/build b/packages/x11/font/font-bitstream-type1/build
index 034170959a..33f1669501 100755
--- a/packages/x11/font/font-bitstream-type1/build
+++ b/packages/x11/font/font-bitstream-type1/build
@@ -28,12 +28,6 @@ cd $PKG_BUILD
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --with-fontdir=$XORG_PATH_FONTS
+            --with-fontrootdir=/usr/share/fonts
 
 make
-
-mkdir -p fonts
-  cp *.afm *.pfb fonts
-
-cd fonts
-  mkfontdir
diff --git a/packages/x11/font/font-bitstream-type1/install b/packages/x11/font/font-bitstream-type1/install
index 6f512fad0c..b1a8422589 100755
--- a/packages/x11/font/font-bitstream-type1/install
+++ b/packages/x11/font/font-bitstream-type1/install
@@ -22,5 +22,11 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/$XORG_PATH_FONTS/Type1
-  cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/Type1
+FONTDIR="$INSTALL/usr/share/fonts/Type1"
+
+mkdir -p $FONTDIR
+  cp $PKG_BUILD/*.afm $FONTDIR
+  cp $PKG_BUILD/*.pfb $FONTDIR
+
+mkfontdir $FONTDIR
+mkfontscale $FONTDIR