release: 1.1.13

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 363f3229ddb71e58b1448df859fbc75f523760b1..3925ccc051738ebbdb7730f984b4cdc368c5a09e 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -2,51 +2,39 @@
 
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont metapost
+STEPMAKE_TEMPLATES=metafont metapost install install-out
 
-EXTRA_DIST_FILES += TODO README feta.mp mfmp.ini
+EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini
 
-
-FET_FILES = $(wildcard feta[0-9]*.mf)
+FET_FILES = $(wildcard feta[0-9]*.mf) feta-din10.mf
 
 LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm))
+AFM_IN_FILES = $(wildcard *.afm.in)
+AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) \
+  $(addprefix $(outdir)/, $(AFM_IN_FILES:.in=))
 XPM_FONTS = feta20
 
 ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
 
-OUT_DIST_FILES += $(AFM_FILES)
+#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
+INSTALLATION_DIR=$(datadir)/mf/
+INSTALLATION_FILES=$(MF_FILES)
+
+INSTALLATION_OUT_DIR=$(datadir)/tex
+INSTALLATION_OUT_FILES=$(TEXTABLES)
+
+INSTALLATION_OUT_DIR1=$(datadir)/afm
+INSTALLATION_OUT_FILES1=$(AFM_FILES)
 
+INSTALLATION_OUT_DIR2=$(datadir)/ly
+INSTALLATION_OUT_FILES2=$(LYTABLES)
+export MFINPUTS:=.:$(MFINPUTS)
 include $(depth)/make/stepmake.make 
 
 default: $(ALL_GEN_FILES)
 
-
 $(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
        $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(outdir)/$(<F:.log=.ly) --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
-
-
-TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(datadir)/tex/ depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(stepdir)/install-outfiles.sub.make $@
-
-AFMINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir)/ INSTALLATION_OUT_FILES="$(AFM_FILES)" -f $(stepdir)/install-outfiles.sub.make $@
-
-LYINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(LYTABLES)" -f $(stepdir)/install-outfiles.sub.make $@
-
-localinstall: $(ALL_GEN_FILES)
-       $(TEXINSTALL)
-       $(LYINSTALL)
-       $(AFMINSTALL)
-
-localuninstall:
-       $(TEXINSTALL)
-       $(LYINSTALL)
-       $(AFMINSTALL)
-
-INSTALLATION_DIR=$(datadir)/mf/
-INSTALLATION_FILES=$(MF_FILES)
-
-include $(stepdir)/installfiles.make
-