- use th paths, fallback to ac ones

Changed files:
    fontpostinst -> 1.13

diff --git a/fontpostinst b/fontpostinst
index 8a432f4438810b6ac6953c5c30f70b408e6694f4..42b99c8c48776e50542455ef353f7d5d2a694950 100644 (file)
--- a/fontpostinst
+++ b/fontpostinst
@@ -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