A little progress with fonts/Makefile.

diff --git a/fonts/Makefile b/fonts/Makefile
index 4942d12ffb7fdc1dc6dcb7e0022ed99b5557df17..42cc152fcffec79a9551047eb9edc9fc8a4ef880 100644 (file)
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -3,7 +3,12 @@
 ZFONTSBDF = Zork_r400-10.bdf Zork_r400-11.bdf Zork_r400-13.bdf Zork_r400-16.bdf Zork_r400-20.bdf
 ZFONTSPCF = $(ZFONTSBDF:.bdf=.pcf)
 
-X11_FONTDIR = $(DESTDIR)$(PREFIX)/share/fonts/X11/zork
+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)
@@ -13,22 +18,23 @@ help:
        @echo "         pcf: Build PCF fonts from BDF fonts"
 
 pcf:   $(ZFONTSPCF)
-       @echo "CFLAGS is $(CFLAGS)"
-       @echo "DESTDIR is $(DESTDIR)"
+#      @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_FONTDIR)"
-       mkdir -p $(X11_FONTDIR)
-       install -m 644 -t $(X11_FONTDIR) $(ZFONTSPCF)
-       $(MKFONTDIR) $(X11_FONTDIR)
-       $(XSET) +fp $(X11_FONTDIR)
+       @echo "Installing X11 fonts to $(X11_ZORK_FONTDIR)"
+       mkdir -p $(X11_ZORK_FONTDIR)
+       install -m 644 -t $(X11_ZORK_FONTDIR) $(ZFONTSPCF)
+       $(MKFONTDIR) $(X11_ZORK_FONTDIR)
+       $(XSET) +fp $(X11_ZORK_FONTDIR)
 
 uninstall_pcf:
-       rm -f $(X11_FONTDIR)/*pcf
-       rm -f $(X11_FONTDIR)/fonts.dir
-       find $(X11_FONTDIR) -depth -type d -empty -exec rmdir "{}" \;
-       $(XSET) -fp $(X11_FONTDIR)
+       rm -f $(X11_ZORK_FONTDIR)/*pcf
+       rm -f $(X11_ZORK_FONTDIR)/fonts.dir
+#      find $(X11_FONTDIR) -depth -type d -empty -exec rmdir "{}" \;
+       $(XSET) -fp $(X11_ZORK_FONTDIR)
 
 clean:
        rm -f $(TARGET) $(OBJECTS) $(ZFONTSPCF)