From: hanwen <hanwen>
Date: Sat, 27 Sep 2003 09:17:57 +0000 (+0000)
Subject: ($(outdir)/%.afm  $(outdir)/%.enc
X-Git-Tag: release/2.1.3~62
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b09d0ebd3ff496e77e0899c5278aeedc3f4a7046;p=lilypond.git

($(outdir)/%.afm  $(outdir)/%.enc
$(outdir)/%.tex $(outdir)/%.dep $(outdir)/%list.ly): list.ly is a
target not a source.
---

diff --git a/ChangeLog b/ChangeLog
index a790b9f4ec..6f48029185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* make/lilypond.redhat.spec.in (Group): remove out=www for web-install 
+
+	* mf/GNUmakefile ($(outdir)/%.afm  $(outdir)/%.enc
+	$(outdir)/%.tex $(outdir)/%.dep $(outdir)/%list.ly): list.ly is a
+	target not a source.
+
 2003-09-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* GNUmakefile.in (web-install): Bugfix: set out prefix Similar to
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index b0854b3f4d..e15a113871 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1688,7 +1688,7 @@ Then, an individual part is made by putting the following in a file:
   instrument = "Horn in F"
 @}
 \score @{
-  \notes \transpose c' f \hornNotes
+  \notes \transpose f c' \hornNotes
 @}
 @end example
 The @code{\include} command substitutes the contents of the file at
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 86e13e2e15..51ba405368 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -108,6 +108,7 @@ $(outdir)/$(redhat-package):
 	wget  --passive-ftp -P $(outdir) ftp://ftp.lilypond.org/pub/LilyPond/binaries/RedHat-9/$(redhat-package)
 
 get-rpm-pfa: $(outdir)/$(redhat-package)
+	cd $(outdir) ; rm -rf usr/ # (root alert!) 
 	cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa'
 	touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS)))
 	cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
@@ -118,7 +119,7 @@ get-pfa: get-rpm-pfa
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm $(outdir)/%list.ly
+$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep $(outdir)/%list.ly: $(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)