diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2003-07-24 18:20:10 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2003-07-24 18:20:10 +0000 |
| commit | b22e169e712aeeb006fe55f7a4196f739493ad94 (patch) | |
| tree | 26b38fe35c99669a2c0a5d6320d55e29f768a191 | |
| parent | 31de5573a9c7e3a69b5ab67e2b0734ba88285b64 (diff) | |
* cygwin/mknetrel: Override $(webdir) (was: $(docdir)).
* stepmake/stepmake/generic-targets.make (www-targets-help):
* GNUmakefile.in (web-install): Install in $(webdir).
* input/test/smart-transpose.ly (texidoc): texidoc compile fix.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | GNUmakefile.in | 4 | ||||
| -rw-r--r-- | cygwin/mknetrel | 2 | ||||
| -rw-r--r-- | input/test/smart-transpose.ly | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/generic-targets.make | 5 |
5 files changed, 15 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2003-07-24 Jan Nieuwenhuizen <janneke@gnu.org> + * cygwin/mknetrel: Override $(webdir) (was: $(docdir)). + + * stepmake/stepmake/generic-targets.make (www-targets-help): + * GNUmakefile.in (web-install): Install in $(webdir). + + * input/test/smart-transpose.ly (texidoc): texidoc compile fix. + * cygwin/changelog: * cygwin/mknetrel: Update. diff --git a/GNUmakefile.in b/GNUmakefile.in index c24afc61ad..542c232167 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -39,8 +39,8 @@ pfa-fonts: tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* ) web-install: - $(INSTALL) -m 755 -d $(local_package_docdir) - tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz + $(INSTALL) -m 755 -d $(webdir) + tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz local-install: $(INSTALL) -d $(local_lilypond_datadir) diff --git a/cygwin/mknetrel b/cygwin/mknetrel index 36255076cd..094e79f714 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -321,7 +321,7 @@ postinstall () { docdir=$prefix/share/doc/$base-$ver #make conf=for-build docdir=$inst-doc/$docdir install-html-doc - make conf=for-build docdir=$inst-doc/$docdir web-install + make conf=for-build webdir=$inst-doc/$docdir web-install ## copy READMEs etc diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index c36fbc084c..f9096c6ee8 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -15,7 +15,7 @@ You mean like this. (Sorry 'bout the nuked indentation.) Modified to use the standard transpose mechanism. The question is how useful these enharmonic modifications are. Mats B. -@end example. +@end example " } diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index fb8e6e6a2f..998b373356 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -180,9 +180,12 @@ web: local-help: www-targets-help +# hmm, append these to generic help? +# (local help targets are prepended) +webdir = $(local_package_docdir) www-targets-help: @echo -e "\ web update website in out-www\n\ - web-install install website documentation in (docdir=$(local_package_docdir))\n\ + web-install install website documentation in (webdir=$(webdir))\n\ web-clean clean out-www\n\ " |