From: Jan Nieuwenhuizen Date: Thu, 15 Aug 2002 13:08:57 +0000 (+0000) Subject: * stepmake/stepmake/help2man-rules.make: Better way of showing X-Git-Tag: release/1.5.74~20 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=06cb0220f167efaa1672d693d4dcb138d2bfe906;p=lilypond.git * 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 50370331e3..eec538e0f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2002-08-15 Jan Nieuwenhuizen + + * 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 * lily/include/file-results.hh (class Input_file_settings): diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi index 4d367498fe..7bde350132 100644 --- 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 96b62a865b..fc28a49b73 100644 --- 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 @@ -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 e000de180d..977ae337b3 100644 --- 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 d5ca98faf7..bf059e4a68 100644 --- 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.")