From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 10 Jan 2009 15:31:59 +0000 (+0100)
Subject: Make scripts/build in web(-1) instead of WWW-post
X-Git-Tag: release/2.12.2-1~32^2~6
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=767d065b18c24ce86fed42e4c2112116892cdbf3;p=lilypond.git

Make scripts/build in web(-1) instead of WWW-post

Reason: web and web-1 are end-user targets, whereas
WWW* targets are for hackers and internal use.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 36ade426bd..d405a7668a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -88,7 +88,6 @@ WEB_TARGETS = offline
 
 WWW-post:
 # need UTF8 setting in case this is hosted on a website.
-	$(MAKE) -C scripts/build out=
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
 	$(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
 	find $(outdir) -name '*-root' | xargs rm -rf
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index b73dfa56b0..41f96567c7 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -187,12 +187,12 @@ WWW-1: local-WWW-1
 WWW-2: local-WWW-2
 	$(LOOP)
 
-web:
-	$(MAKE) out=www WWW-1
+web: web-1
 	$(MAKE) out=www WWW-2
 	$(MAKE) out=www WWW-post
 
 web-1:
+	$(MAKE) -C $(depth)/scripts/build out=
 	$(MAKE) out=www WWW-1
 
 web-clean: