* make/srcdir.make.in (web): Add special web target.

	* stepmake/stepmake/generic-targets.make (WWW): Remove $(MAKE)
	from inner $(LOOP).

diff --git a/ChangeLog b/ChangeLog
index 4f893a5077115044b9e18a6ef76ac07dae969946..5feee5d400b222a768d4d50628980037fabddf96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 
 2003-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * make/srcdir.make.in (web): Add special web target.
+
+       * stepmake/stepmake/generic-targets.make (WWW): Remove $(MAKE)
+       from inner $(LOOP).
+
        * cygwin/mknetrel: Override $(webdir) (was: $(docdir)).
 
        * stepmake/stepmake/generic-targets.make (www-targets-help):

diff --git a/cygwin/changelog b/cygwin/changelog
index 09443cd7774a8c65fd2e051d45866c4c07cbbec1..0781fac766bb81d479b29f3aa31bc312e4a6031e 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,9 @@
+lilypond (1.7.28-2) unstable; urgency=low
+
+  * New upstream release; pre1.8 build.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Thu, 24 Jul 2003 19:31:59 +0200
+
 lilypond (1.7.25-1) unstable; urgency=low
 
   * New upstream release: pre1.8 build.

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 094e79f71459fb5b6e0724c26d412fea2d929594..b1e4acb6f2f1377ec4caf133842a5078ffd6d96d 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -291,10 +291,6 @@ prebuild () {
     # Build for build, generating doc
     cd $build || exit 1
     
-    # ugh, footify fix
-    cd $src && ln -s GNUmakefile.in GNUmakefile
-
-    cd $build || exit 1
     #PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1
     PATH=/bin:/usr/bin:$PATH make conf=for-build all doc web || exit 1
     for i in $(find . -path "out-for-build/*.1"); do

diff --git a/make/srcdir.make.in b/make/srcdir.make.in
index f38e0de03d55f53e1320bf50eee4034f502a6025..d4b4f2d5c70b8bbb6336970fe6f2b0cff5c8b561 100644 (file)
--- a/make/srcdir.make.in
+++ b/make/srcdir.make.in
@@ -35,9 +35,13 @@ config = config$(CONFIGSUFFIX).make
 
 include $(config)
 
-SRCDIR=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir) $@
+SRCDIR=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir)
 
 default: all
 
 %:
-       $(SRCDIR)
+       $(SRCDIR) $@
+
+web: 
+       $(SRCDIR) out=www WWW
+       $(SRCDIR) out=www WWW-post

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 998b37335675e16cbdd40677200475448c035f43..701c2ca3c2faf3075e6d53089d31cefcaa72b90e 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -43,6 +43,8 @@ Usage: make ["VARIABLE=value"]... [TARGET]\n\
 \n\
 Targets:\n"
 
+# urg
+webdir = $(local_package_docdir)
 help: generic-help local-help
        @echo -e "\
   all         update everything\n\
@@ -53,6 +55,9 @@ help: generic-help local-help
   help        this help\n\
   install     install programs and data (prefix=$(prefix))\n\
   lib         update all libraries\n\
+  web         update website in out-www\n\
+  web-install install website documentation in (webdir=$(webdir))\n\
+  web-clean   clean out-www\n\
   TAGS        genarate tagfiles\n\
 \n\
 Make may be invoked from any subdirectory\n\
@@ -169,23 +174,14 @@ release:
 local-WWW:
 local-WWW-post:
 local-web-post:
+web-install:
 
 WWW: local-WWW
        $(LOOP)
-       $(MAKE) local-WWW-post
 
-web:
-       $(MAKE) out=www WWW
-       $(MAKE) local-web-post
-
-local-help: www-targets-help
+WWW-post:
+       $(LOOP)
 
-# 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 (webdir=$(webdir))\n\
-  web-clean   clean out-www\n\
-"
+web: 
+       $(MAKE) out=www WWW
+       $(MAKE) out=www WWW-post

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 1a45ff95c7a69e7041357190c48ac0426691ee8c..e671d3855a917d126668c78c0e3fcb95560a20e1 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -70,9 +70,6 @@ local-help:
   po          make new translation Portable Object database\n\
   po-replace  do po-update and replace catalogs with msgmerged versions\n\
   po-update   update translation Portable Object database\n\
-  web         update website in out-www\n\
-  web-doc     generate documentation website\n\
-  web-clean   clean out-www\n\
 \n\
 Some of these top level targets (diff, dist, release) can be issued\n\
 from anywhere in the source tree.\n\

diff --git a/stepmake/stepmake/www-targets.make b/stepmake/stepmake/www-targets.make
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..108d4b9f48232523565735e7fb8709dc6850af53 100644 (file)
--- a/stepmake/stepmake/www-targets.make
+++ b/stepmake/stepmake/www-targets.make
@@ -0,0 +1 @@
+# moved to generic-targets.make
\ No newline at end of file