summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2001-07-10 06:57:46 +0000
committerMatt Wilson <msw@redhat.com>2001-07-10 06:57:46 +0000
commitcd4f9334538eb0ba560f58eda795952713795ebc (patch)
treec6d92d110dd73b35493d20020dfad2a08d22f24e /scripts
parenta15f36c5999515b8cf6c7be4cf551ac75b004748 (diff)
downloadanaconda-cd4f9334538eb0ba560f58eda795952713795ebc.tar.gz
anaconda-cd4f9334538eb0ba560f58eda795952713795ebc.tar.xz
anaconda-cd4f9334538eb0ba560f58eda795952713795ebc.zip
use mkfontdir from the X package we're using, build encodings.dir and include big5 map
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/upd-instroot7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index ff1def993..74314b39e 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -322,12 +322,14 @@ usr/X11R6/bin/XsunMono
usr/X11R6/bin/Xtest
usr/X11R6/bin/setxkbmap
usr/X11R6/bin/xsetroot
+usr/X11R6/bin/mkfontdir
usr/X11R6/lib/X11/XKeysymDB
usr/X11R6/lib/X11/fonts/75dpi/cour*
usr/X11R6/lib/X11/fonts/75dpi/fonts*
usr/X11R6/lib/X11/fonts/75dpi/helv*
usr/X11R6/lib/X11/fonts/75dpi/tim*
usr/X11R6/lib/X11/fonts/cyrillic/*
+usr/X11R6/lib/X11/fonts/encodings/big5*
usr/X11R6/lib/X11/fonts/misc/12x*
usr/X11R6/lib/X11/fonts/misc/6x*
usr/X11R6/lib/X11/fonts/misc/7x*
@@ -548,9 +550,8 @@ rm -f $DESTGR/usr/X11R6/lib/modules/extensions/lib{GLcore,glx,pex5}*
echo "Running mkfontdir..."
if [ -n "$NEEDGR" ]; then
- for I in $DESTGR/usr/X11R6/lib/X11/fonts/* $DESTGR/usr/share/fonts/ISO8859-2/* $DESTGR/usr/share/fonts/ISO8859-9/*; do
- /usr/X11R6/bin/mkfontdir $I
- done
+ $DESTGR/usr/X11R6/bin/mkfontdir -p /usr/X11R6/lib/X11/fonts/encodings/ -e $DESTGR/usr/X11R6/lib/X11/fonts/encodings $DESTGR/usr/X11R6/lib/X11/fonts/* $DESTGR/usr/share/fonts/ISO8859-2/* $DESTGR/usr/share/fonts/ISO8859-9/*
+ rm $DESTGR/usr/X11R6/bin/mkfontdir
fi
rm -f $KEEPFILE $KEEPFILEGR