* stepmake/stepmake/help2man-rules.make: Better way of showing

help2man command.

* Documentation/topdocs/FAQ.texi: Add more possible stale font
paths.

* stepmake/bin/package-diff.py: Prepend ./ to cut-and-pastable
commands.

* Documentation/topdocs/INSTALL.texi: Mention the need to and how
to create configure for CVS source trees.  Mention libkpathsea-dev
as alternative possible name for tetex-devel (or should that be
the other way around?).

diff --git a/ChangeLog b/ChangeLog
index 50370331e3fa23f39e8f25669643f3d8fb5c8e98..eec538e0f1e2c027687be3b2943ff4924ac4de82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-08-15  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/help2man-rules.make: Better way of showing
+       help2man command.
+
+       * Documentation/topdocs/FAQ.texi: Add more possible stale font
+       paths.
+
+       * stepmake/bin/package-diff.py: Prepend ./ to cut-and-pastable
+       commands.
+
+       * Documentation/topdocs/INSTALL.texi: Mention the need to and how
+       to create configure for CVS source trees.  Mention libkpathsea-dev
+       as alternative possible name for tetex-devel (or should that be
+       the other way around?).
+
 2002-08-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/include/file-results.hh (class Input_file_settings):

diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi
index 4d367498fe77a954679b5f7b3cee16723b843256..7bde350132e848ce804124a185aef592f1fa0e4d 100644 (file)
--- a/Documentation/topdocs/FAQ.texi
+++ b/Documentation/topdocs/FAQ.texi
@@ -84,8 +84,9 @@ the symbols should appear on the printout.
 @subsection I upgraded, and now my symbols are all messed up
 
 We obviously mucked with the fonts in the upgrade.  Remove all
-previous fonts, including the .pk and .tfm fonts in /var/lib/texmf.  A
-script automating this has been included, see
+previous fonts, including any .pk and .tfm fonts in
+@file{/var/lib/texmf}, @file{/var/spool/texmf}, @file{/var/tmp/texmf}
+or @file{/tmp}.  A script automating this has been included, see
 @file{buildscripts/clean-fonts.sh}.
 
 @bye

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 96b62a865bff426cc82f1e2f59b921b034d99c1f..fc28a49b738460744b6962c392cc6e46392fbec6 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -61,6 +61,12 @@ from source drill.
 The latest development version is also available through anonymous
 CVS. See @uref{http://savannah.gnu.org/cvs/?group=lilypond}.
 
+CVS does not contain generated files.  To create @file{configure}, run
+@quotation
+@example
+./autogen.sh
+@end example
+@end quotation
 
 @html
 <a name="download-binaries">
@@ -160,9 +166,10 @@ Check out @uref{http://www.gnu.org/software/bison/,the bison  webpage}
 
 @TeX{} is used as an output backend.
 
-Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf}, @file{.afm}, @file{.tfm}).
-Make sure you have tetex 1.0 or newer (1.0.6 is known to work).  You may
-need to install a tetex-devel or tetex-dev package too.
+Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf},
+@file{.afm}, @file{.tfm}).  Make sure you have tetex 1.0 or newer
+(1.0.6 is known to work).  You may need to install a tetex-devel (or
+tetex-dev or libkpathsea-dev) package too.
 
 @item Texinfo (version 4.2 or newer).
 The documentation of lily is written in texinfo.  Check out

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index e000de180d6e055d9f2a44e3d7b316b00397df54..977ae337b313d280fe4f4f50a0f8a83ae509d1b7 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -173,8 +173,8 @@ Patches do not contain automatically generated files
 or (urg) empty directories, 
 i.e., you should run
 
-       autogen.sh
-       configure [your options.]
+       ./autogen.sh
+       ./configure [your options.]
 
        
 """

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index d5ca98faf7977777c4612a26cf43a2b4b0c06c1b..bf059e4a682f0208063a1d729f97f7c016b91bd6 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -1,20 +1,31 @@
-# ugh. 
-# Man-page:
+ifneq ($(outdir),./out)
+$(outdir)/%.1: out/%.1
+       cp $< $@
+endif
+
+# We must invoke the generated $(outdir)/help2man script instead of
+# the help2man.pl source, which means that the buildscripts directory
+# must be built first.
+#
+# From the perlrun man-page:
+#
 #      If the #! line does not contain the word "perl", the
 #       program named after the #! is executed instead of the Perl
 #       interpreter.  This is slightly bizarre, but it helps
-# Indeed it is. Perl sucks.
 #
+# Indeed it is.  Perl sucks.
+#
+# Two screenfulls explaining that the otherwise standard #! is broken
+# for perl, and arguing that this broken magic is better in some
+# cases.  Four more explaining what a line comment is, and that it may
+# be parsed, same here.
 
-ifneq ($(outdir),./out)
-$(outdir)/%.1: out/%.1
-       cp $< $@
-endif
+HELP2MAN_COMMAND = $(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@
 
 $(outdir)/%.1: $(outdir)/%
-       echo "generating man page from --help"
-#ugh, don't hide make rules --hampers debugging
-       $(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
+       @echo "generating man page from $< --help"
+       @echo "$(HELP2MAN_COMMAND)"
+       @$(HELP2MAN_COMMAND) || \
        (echo ""; echo "Apparently the man pages failed to build. This is";\
        echo "no problem, since they don't contain any information anyway.";\
        echo "Please run make again, and be prepared for NO manual pages.")