From f590506a68e2e682182eb961469c15095d7729e7 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Wed, 25 Jan 2023 23:41:12 -0800 Subject: [PATCH] Now I have a sensible fonts/Makefile. Add targets for installing .bdf fonts. --- fonts/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fonts/Makefile b/fonts/Makefile index 42cc152..78d0de1 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -4,12 +4,9 @@ ZFONTSBDF = Zork_r400-10.bdf Zork_r400-11.bdf Zork_r400-13.bdf Zork_r400-16.bdf ZFONTSPCF = $(ZFONTSBDF:.bdf=.pcf) FONTDIR = $(DESTDIR)$(PREFIX)/share/fonts -#X11_FONTDIR = $(FONTDIR)/X11/zork X11_FONTDIR = $(FONTDIR)/X11 X11_ZORK_FONTDIR = $(X11_FONTDIR)/zork - - MKFONTDIR ?= $(shell which mkfontdir) XSET ?= $(shell which xset) @@ -18,10 +15,6 @@ help: @echo " pcf: Build PCF fonts from BDF fonts" pcf: $(ZFONTSPCF) -# @echo "CFLAGS is $(CFLAGS)" -# @echo "DESTDIR is $(DESTDIR)" - @echo "X11_FONTDIR is $(X11_FONTDIR)" - @echo "X11_ZORK_FONTDIR is $(X11_ZORK_FONTDIR)" install_pcf: pcf @echo "Installing X11 fonts to $(X11_ZORK_FONTDIR)" @@ -33,7 +26,8 @@ install_pcf: pcf uninstall_pcf: rm -f $(X11_ZORK_FONTDIR)/*pcf rm -f $(X11_ZORK_FONTDIR)/fonts.dir -# find $(X11_FONTDIR) -depth -type d -empty -exec rmdir "{}" \; + # Remove as much as we added as we can. + find $(FONTDIR) -depth -type d -empty -exec rmdir "{}" \; $(XSET) -fp $(X11_ZORK_FONTDIR) clean: -- 2.34.1