SOURCES: fontpostinst - use th paths, fallback to ac ones

[arekm]

Author: arekm                        Date: Tue Apr  4 07:36:47 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use th paths, fallback to ac ones

---- Files affected:
SOURCES:
   fontpostinst (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/fontpostinst
diff -u SOURCES/fontpostinst:1.12 SOURCES/fontpostinst:1.13
--- SOURCES/fontpostinst:1.12	Sat Feb 18 19:27:04 2006
+++ SOURCES/fontpostinst	Tue Apr  4 09:36:42 2006
@@ -14,11 +14,16 @@
 
 FBASEDIR="/usr/share/fonts"
 
-MKFONTDIRBIN="/usr/X11R6/bin/mkfontdir"
+MKFONTDIRBIN="/usr/bin/mkfontdir"
 MKFONTDIR="$MKFONTDIRBIN"
-MKFONTSCALEBIN="/usr/X11R6/bin/mkfontscale"
+if [ ! -x "$MKFONTDIRBIN" -a -x /usr/X11R6/bin/mkfontdir ]; then
+	MKFONTDIR="/usr/X11R6/bin/mkfontdir"
+fi
+MKFONTSCALEBIN="/usr/bin/mkfontscale"
 MKFONTSCALE="$MKFONTSCALEBIN"
-
+if [ ! -x "$MKFONTSCALEBIN" -a -x /usr/X11R6/bin/mkfontscale ]; then
+	MKFONTSCALEBIN="/usr/X11R6/bin/mkfontscale"
+fi
 MKTTFFONTSCALEBIN="$MKFONTSCALEBIN"
 MKTTFFONTSCALE="$MKTTFFONTSCALEBIN"
 if [ ! -x "$MKFONTSCALEBIN" -a -x /usr/bin/ttmkfdir ]; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/fontpostinst?r1=1.12&r2=1.13&f=u