Remove copy of DejaVu font and prioritize helvetica

[micropolis] / Makefile

diff --git a/Makefile b/Makefile
index 3f55dcc1da21ed0eb9ab6c9555c1a0db1b91e5b9..d502fdd766e156e71cfca3a4a911bd24e65e5945 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PREFIX=/usr/local
 DATADIR=$(PREFIX)/share/micropolis
-LIBEXECDIR=$(PREFIX)/libexec
+LIBEXECDIR=$(PREFIX)/libexec/micropolis
 BINDIR=$(PREFIX)/bin
 DOCDIR=$(PREFIX)/share/doc/micropolis
 PIXMAPDIR=$(PREFIX)/share/pixmaps
@@ -8,7 +8,7 @@ APPLICATIONSDIR=$(PREFIX)/share/applications
 
 INSTALL=install
 
-DIRS=  $(DESTDIR)/$(DATADIR)/res/sounds $(DESTDIR)/$(DATADIR)/res/dejavu-lgc \
+DIRS=  $(DESTDIR)/$(DATADIR)/res/sounds \
        $(DESTDIR)/$(DATADIR)/images $(DESTDIR)/$(DATADIR)/cities \
        $(DESTDIR)/$(LIBEXECDIR) $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(DOCDIR) \
        $(DESTDIR)/$(PIXMAPDIR) $(DESTDIR)/$(APPLICATIONSDIR)
@@ -64,12 +64,13 @@ install-dirs:
 install-bin:
        $(INSTALL) -m 0755 res/sim $(DESTDIR)/$(LIBEXECDIR)/sim
        $(INSTALL) -m 0755 res/sounds/player $(DESTDIR)/$(DATADIR)/res/sounds/player
-       echo "SIMHOME=$(DATADIR); export SIMHOME" >$(DESTDIR)/$(BINDIR)/micropolis
+       echo "#!/bin/sh" >$(DESTDIR)/$(BINDIR)/micropolis
+       echo "SIMHOME=$(DATADIR); export SIMHOME" >>$(DESTDIR)/$(BINDIR)/micropolis
        echo "echo \"Starting Micropolis in \$${SIMHOME} ... \"" >>$(DESTDIR)/$(BINDIR)/micropolis
-       echo "cd $(DATADIR) && $(LIBEXECDIR)/sim \$$*" >>$(DESTDIR)/$(BINDIR)/micropolis
+       echo "cd $(DATADIR) && exec $(LIBEXECDIR)/sim \"\$$@\"" >>$(DESTDIR)/$(BINDIR)/micropolis
        chmod 755 $(DESTDIR)/$(BINDIR)/micropolis
 
-install-res: install-res-sounds install-res-dejavu-lgc
+install-res: install-res-sounds
        for file in $(RES); do \
                install -m 0644 $$file $(DESTDIR)/$(DATADIR)/$$file; \
        done
@@ -77,9 +78,6 @@ install-res: install-res-sounds install-res-dejavu-lgc
 install-res-sounds:
        find res/sounds -type f -name \*.wav -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/res/sounds/ \;
 
-install-res-dejavu-lgc:
-       find res/dejavu-lgc -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/ \;
-
 install-images:
        find images -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/images/ \;
 
@@ -100,11 +98,6 @@ uninstall:
        rm -f $(DESTDIR)/$(DATADIR)/res/sounds/player
        rm -f $(DESTDIR)/$(DATADIR)/res/sounds/*.wav
        -rmdir $(DESTDIR)/$(DATADIR)/res/sounds
-       rm -f $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/*ttf \
-               $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/fonts.alias \
-               $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/fonts.dir \
-               $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/fonts.scale
-       -rmdir $(DESTDIR)/$(DATADIR)/res/dejavu-lgc
        for file in $(RES); do \
                rm $(DESTDIR)/$(DATADIR)/$$file; \
        done
@@ -120,5 +113,5 @@ uninstall:
        rm -f $(DESTDIR)/$(PIXMAPDIR)/micropolis.png
 
 .PHONY: all clean install install-dirs install-bin install-res \
-       install-res-sounds install-res-dejavu-lgc install-images \
+       install-res-sounds install-images \
        install-cities install-doc install-desktop uninstall tcl tk tclx sim