From e86d4ccf079ab9d54feec5507bfc10a417d09a2f Mon Sep 17 00:00:00 2001 From: David Griffith Date: Thu, 5 Jan 2023 20:14:09 -0800 Subject: [PATCH] Run xset after install/deinstall to add/delete font path entries. When running Beyond Zork and telling the game you're using a VT220, if "xset +fp $(X11_FONTDIR)" is not run, garbage is printed instead of VT220 graphic characters. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index f8985c8..89548a1 100644 --- a/Makefile +++ b/Makefile @@ -232,6 +232,7 @@ CURSES_DEFINE = USE_NCURSES_H endif MKFONTDIR ?= $(shell which mkfontdir) +XSET ?= $(shell which xset) export CC export CFLAGS @@ -678,6 +679,7 @@ install_xfrotz: $(XFROTZ_BIN) install -m 644 "$(X11_DIR)/Zork_r400-16.pcf" "$(X11_FONTDIR)" install -m 644 "$(X11_DIR)/Zork_r400-20.pcf" "$(X11_FONTDIR)" $(MKFONTDIR) $(X11_FONTDIR) + $(XSET) +fp $(X11_FONTDIR) uninstall_x11: uninstall_xfrotz uninstall-x11: uninstall_xfrotz @@ -692,6 +694,7 @@ uninstall_xfrotz: rm -f "$(X11_FONTDIR)/Zork_r400-20.pcf" rm -f "$(X11_FONTDIR)/fonts.dir" find $(X11_FONTDIR) -depth -type d -empty -exec rmdir "{}" \; + $(XSET) -fp $(X11_FONTDIR) install-sdl: install_sfrotz install_sdl: install_sfrotz -- 2.34.1