From 93c012f8b67222d153c9298062f268c6a7d25b0e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 24 Jul 2003 20:05:16 +0000
Subject: [PATCH] 	* make/srcdir.make.in (web): Add special web target.

	* stepmake/stepmake/generic-targets.make (WWW): Remove $(MAKE)
	from inner $(LOOP).
---
 ChangeLog                               |  5 +++++
 cygwin/changelog                        |  6 ++++++
 cygwin/mknetrel                         |  4 ----
 make/srcdir.make.in                     |  8 ++++++--
 stepmake/stepmake/generic-targets.make  | 26 +++++++++++--------------
 stepmake/stepmake/toplevel-targets.make |  3 ---
 stepmake/stepmake/www-targets.make      |  1 +
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f893a5077..5feee5d400 100644
--- 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 09443cd777..0781fac766 100644
--- 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 094e79f714..b1e4acb6f2 100644
--- 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 f38e0de03d..d4b4f2d5c7 100644
--- 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 998b373356..701c2ca3c2 100644
--- 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 1a45ff95c7..e671d3855a 100644
--- 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 e69de29bb2..108d4b9f48 100644
--- 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
-- 
2.39.2