From: janneke <janneke>
Date: Sat, 27 Sep 2003 09:45:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.3~59
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5fb0b261a09e359024091ae218baa3945c7be4ff;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index c1040eec41..3ab4ab7fc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-27  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* mf/GNUmakefile: resolve conflict: %list.ly is a target, not a
+	dependency
+
 2003-09-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* Documentation/user/lilypond.tely (Unified index): rename Index
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 51ba405368..d20b66dba8 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -119,7 +119,7 @@ get-pfa: get-rpm-pfa
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep $(outdir)/%list.ly: $(outdir)/%.log $(outdir)/%.tfm 
+$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
 	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir)