release: 1.1.28

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 984dc6371058df8b84d8efb60cebbb15c2101dff..b2db6331c515640eeb975182d0b2db7207663879 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -11,12 +11,11 @@ FET_FILES = $(wildcard feta[0-9]*.mf)
 LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-AFM_IN_FILES = $(wildcard *.afm.in)
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) \
-  $(addprefix $(outdir)/, $(AFM_IN_FILES:.in=))
 XPM_FONTS = feta20
+AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) 
+TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) 
 
-ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
+ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(datadir)/mf/
@@ -26,11 +25,12 @@ INSTALLATION_OUT_DIR=$(datadir)/tex
 INSTALLATION_OUT_FILES=$(TEXTABLES)
 
 INSTALLATION_OUT_DIR1=$(datadir)/afm
-INSTALLATION_OUT_FILES1=$(AFM_FILES)
+INSTALLATION_OUT_FILES1=$(AFM_FILES) $(TFM_FILES)#ugh
 
 INSTALLATION_OUT_DIR2=$(datadir)/ly
 INSTALLATION_OUT_FILES2=$(LYTABLES)
 
+export MFINPUTS:=.:$(MFINPUTS)
 include $(depth)/make/stepmake.make 
 
 default: $(ALL_GEN_FILES)