Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

diff --cc GNUmakefile.in
Simple merge

diff --cc stepmake/stepmake/generic-targets.make
index ced5b7e3f7e76ee6b6b8b5d7a449dc0168a5f71c,250eace2f865cdb7deae0513fcde2ecf1f42db86..f4f1390769b28589290a43223dfc3b3e325d78e2
--- 1/stepmake/stepmake/generic-targets.make
--- 2/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@@ -177,12 -171,9 +177,13 @@@ WWW-2: local-WWW-
        $(LOOP)
  
  web:
 -      $(MAKE) out=www WWW
 +      $(MAKE) out=www WWW-1
 +      $(MAKE) out=www WWW-2
        $(MAKE) out=www WWW-post
  
 +web-1:
 +      $(MAKE) out=www WWW-1
 +
  web-clean:
+       find -name out-www | xargs rm -rf
        $(MAKE) out=www clean