[Lunar-commits] <moonbase> xawtv-fonts: Some adjustments here.

[Dennis `stumbles` Veatch]

commit 7b6607e3bf2564cfb47f347feb4bd17d2a5bb2d8
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri May 6 04:28:09 2011 -0400

    xawtv-fonts: Some adjustments here.
---
 fonts/xawtv-fonts/BUILD        |   11 ++++++-----
 fonts/xawtv-fonts/POST_INSTALL |    4 ++--
 fonts/xawtv-fonts/POST_REMOVE  |    6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fonts/xawtv-fonts/BUILD b/fonts/xawtv-fonts/BUILD
index 4a6dda4..bd21194 100644
--- a/fonts/xawtv-fonts/BUILD
+++ b/fonts/xawtv-fonts/BUILD
@@ -1,14 +1,15 @@
 (
   
-  OLD_DISPLAY=$DISPLAY
-  unset DISPLAY
+  OLD_DISPLAY=$DISPLAY &&
+  unset DISPLAY &&
 
   make &&
   prepare_install &&
-  install *.pcf.gz -m 444 /usr/X11R6/lib/X11/fonts/misc/
+  mkdir -p /usr/share/fonts/xawtv-fonts &&
+  install *.pcf.gz -m 444 /usr/share/fonts/xawtv-fonts &&
 
-  DISPLAY=$OLD_DISPLAY
-  unset OLD_DISPLAY
+  DISPLAY=$OLD_DISPLAY &&
+  unset OLD_DISPLAY &&
 
   true
 
diff --git a/fonts/xawtv-fonts/POST_INSTALL b/fonts/xawtv-fonts/POST_INSTALL
index 8e18b9c..5e0b525 100644
--- a/fonts/xawtv-fonts/POST_INSTALL
+++ b/fonts/xawtv-fonts/POST_INSTALL
@@ -1,5 +1,5 @@
-cat $SCRIPT_DIRECTORY/fonts.alias >> /usr/X11R6/lib/X11/fonts/misc/fonts.alias
-cd /usr/X11R6/lib/X11/fonts/misc && mkfontdir
+cat $SCRIPT_DIRECTORY/fonts.alias >> /usr/share/fonts/xawtv-fonts/fonts.alias
+cd /usr/share/fonts/xawtv-fonts && mkfontdir
 echo '********************************************************************'
 echo '*                                                                  *'
 echo '*       Please update your font path with "xset fp hash"           *'
diff --git a/fonts/xawtv-fonts/POST_REMOVE b/fonts/xawtv-fonts/POST_REMOVE
index ac73227..b142f07 100644
--- a/fonts/xawtv-fonts/POST_REMOVE
+++ b/fonts/xawtv-fonts/POST_REMOVE
@@ -1,6 +1,6 @@
-cd /usr/X11R6/lib/X11/fonts/misc && mkfontdir
-cat /usr/X11R6/lib/X11/fonts/misc/fonts.alias | grep -v '-ets-teletext-' > /usr/X11R6/lib/X11/fonts/misc/.fonts.alias
-mv /usr/X11R6/lib/X11/fonts/misc/.fonts.alias /usr/X11R6/lib/X11/fonts/misc/fonts.alias
+cd /usr/share/fonts/xawtv-fonts && mkfontdir
+cat /usr/share/fonts/xawtv-fonts/fonts.alias | grep -v '-ets-teletext-' > /usr/share/fonts/xawtv-fonts/.fonts.alias
+mv /usr/share/fonts/xawtv-fonts/.fonts.alias /usr/share/fonts/xawtv-fonts/fonts.alias
 echo '********************************************************************'
 echo '*                                                                  *'
 echo '*       Please update your font path with "xset fp hash"           *'