The SlackBuild script for the wqy-bitmapfont package

1 files changed, 7 insertions, 2 deletions

diff --git a/wqy-bitmapfont/build/wqy-bitmapfont.SlackBuild b/wqy-bitmapfont/build/wqy-bitmapfont.SlackBuild
index 35dfe4d3..398a62e7 100755
--- a/wqy-bitmapfont/build/wqy-bitmapfont.SlackBuild
+++ b/wqy-bitmapfont/build/wqy-bitmapfont.SlackBuild
@@ -141,8 +141,11 @@ chmod -R u+w,go+r-w,a-s .
 
 # Install the font files:
 for font in $(ls *.pcf) ; do
-  gzip  -9cf $font > $PKG$FONTDIR/misc/$font.gz
+  gzip -9cf $font > $PKG$FONTDIR/$font.gz
 done
+cp fonts.alias $PKG$FONTDIR/
+# So that the package uninstalls cleanly:
+touch $PKG$FONTDIR/fonts.{dir,scale}
 
 # Install the fontconfig file:
 cp 85-wqy-bitmapsong.conf $PKG/etc/fonts/conf.avail/
@@ -155,14 +158,16 @@ mkdir -p $PKG/install
 cat <<-EOT > $PKG/install/doinst.sh
 	# Update X font indexes and the font cache:
 	if [ -x .$XPREF/bin/mkfontdir ]; then
+	  rm -f $FONTDIR/fonts.{dir,scale}
 	  chroot . $XPREF/bin/mkfontdir $FONTDIR
-	  cp fonts.dir fonts.scale
+	  cp ${FONTDIR}/fonts.dir ${FONTDIR}/fonts.scale
 	fi
 	if [ -x .$XPREF/bin/fc-cache ]; then
 	  chroot . $XPREF/bin/fc-cache $FONTDIR
 	fi
 	
 	# Inform user of actions left for him/her to do:
+	echo ""
 	echo "**"
 	echo "To make the font permanemtly available in future X sessions,"
 	echo "add the following line to your /etc/X11/xorg.conf :"