* 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.

diff --git a/ChangeLog b/ChangeLog
index c3af5190c57f5f7b5b464dfdd88e85e19b702966..cd5a16b1f7024e39904e113c8dcac442fc761da2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 c24afc61ad054e6e44a7771d6d591299f79370fa..542c232167dfc325c857dfa6d3413985ad7c89a1 100644 (file)
--- 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 36255076cd80051577fa4790e8a8d1dc6904aeec..094e79f71459fb5b6e0724c26d412fea2d929594 100644 (file)
--- 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 c36fbc084c3aae9dce35e4c7598dcf650201b0cb..f9096c6ee893b22882d9890a680a3248da587dee 100644 (file)
--- 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 fb8e6e6a2f399f026bcce5845c3fd7105d5f11d1..998b37335675e16cbdd40677200475448c035f43 100644 (file)
--- 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\
 "