X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=389f7b9baf88a3720e8e0f23ebf6a4ea929539ab;hb=150be05ab6c52ed8760d4dc1b05870355ce7b708;hp=eb37ee3093e8f2747d5c7f03fae9b3799bcc5fb6;hpb=2a07e2ea1924abec1b70e2150e698e5792ae1687;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index eb37ee3093..389f7b9baf 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -120,8 +120,8 @@ $(outdir)/aybabtu.fontname:
 $(outdir)/aybabtu.subfonts:
 	echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
-$(PE_SCRIPTS): $(top-build-dir)/buildscripts/$(outdir)/gen-emmentaler-scripts
-	$(PYTHON) $< --dir=$(outdir)
+$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts
+	$< --dir=$(outdir)
 
 ALL_FONTS = $(FETA_FONTS)
 PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
@@ -165,7 +165,7 @@ default: $(ALL_GEN_FILES) \
 .PHONY: tree-regen
 
 # FIXME: temporary hack: must regenerate after building fonts
-tree-regen:
+tree-regen: $(ALL_GEN_FILES)
 	${MAKE} -C $(top-build-dir) link-mf-tree
 
 ##
@@ -174,12 +174,12 @@ $(outdir)/%.lisp \
 $(outdir)/%.otf-gtable \
 $(outdir)/%.enc \
 $(outdir)/%.pe: $(outdir)/%.log
-	$(PYTHON) $(buildscript-dir)/mf-to-table.py \
-		  --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) \
-		  --lisp=$(outdir)/$(<F:.log=.lisp) \
-		  --outdir=$(outdir) \
-		  --enc $(outdir)/$(<F:.log=.enc) \
-		  $<
+	$(buildscript-dir)/mf-to-table \
+		--global-lisp=$(outdir)/$(<F:.log=.otf-gtable) \
+		--lisp=$(outdir)/$(<F:.log=.lisp) \
+		--outdir=$(outdir) \
+		--enc $(outdir)/$(<F:.log=.enc) \
+		$<
 
 local-clean:
 	rm -f mfplain.mem mfplain.log
@@ -190,9 +190,9 @@ $(outdir)/fonts.conf:
 	echo '<fontconfig><dir>'$(shell cd $(outdir); pwd)'</dir></fontconfig>' > $@
 
 $(NCSB_OTFS): $(NCSB_SOURCE_FILES) \
-	      $(buildscript-dir)/pfx2ttf.fontforge
+	      $(auxscript-dir)/pfx2ttf.fontforge
 	$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
-		$(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
+		$(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \
 			$(i).pfb $(i).afm $(outdir)/ && ) true
 
 # eof