Remove copy of DejaVu font and prioritize helvetica

[micropolis] / src / makefile

diff --git a/src/makefile b/src/makefile
index 57217b1de27b011c1829e8667892314b03ce4a9b..b42cf24774e0a3fb792f091bf900d0a7894893cc 100644 (file)
--- a/src/makefile
+++ b/src/makefile
@@ -75,10 +75,10 @@ TARFILES = \
        micropolis-activity/Micropolis.png
 
 all:
-       cd tcl ; make all
-       cd tk ; make all
-       cd tclx ; make all
-       cd sim ; make all
+       cd tcl ; $(MAKE) all
+       cd tk ; $(MAKE) all
+       cd tclx ; $(MAKE) all
+       cd sim ; $(MAKE) all
 
 clean:
        rm -f Micropolis.tgz
@@ -86,10 +86,10 @@ clean:
        (cd .. ; touch junk~ ; rm -f *~)
        touch junk~ ; rm -f *~
        rm -rf BUILDIT
-       cd tcl ; make clean
-       cd tk ; make clean
-       cd tclx ; make clean
-       cd sim ; make clean
+       cd tcl ; $(MAKE) clean
+       cd tk ; $(MAKE) clean
+       cd tclx ; $(MAKE) clean
+       cd sim ; $(MAKE) clean
 
 install: all
        (cd $(RES) ; rm -f sim)
@@ -106,8 +106,6 @@ xo:  install
        rm -rf BUILDIT
        mkdir BUILDIT
        tar cf - -C ../.. $(TARFILES) | (cd BUILDIT; tar xf -)
-       # The DejaVu fonts are not needed on the XO, only other platforms.
-       rm -rf BUILDIT/micropolis-activity/res/dejavu-lgc
        mv BUILDIT/micropolis-activity BUILDIT/micropolis.activity
        (cd BUILDIT; zip -r ../../../micropolis.xo micropolis.activity)
        rm -rf BUILDIT