From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Tue, 19 Aug 2008 18:53:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev... 
X-Git-Tag: release/2.11.58-1~32^2~53
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cbff1a4a581b6c99ff063792b38fba3c1df7df5d;hp=-c;p=lilypond.git

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

cbff1a4a581b6c99ff063792b38fba3c1df7df5d
diff --combined stepmake/stepmake/generic-targets.make
index a9ba8453e1,24f8f65aed..2df68ac3ca
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@@ -1,6 -1,5 +1,6 @@@
 -.PHONY : all clean bin-clean config default dist doc exe help\
 -         html lib TAGS po
 +.PHONY : all clean bin-clean config default dist doc exe help html lib TAGS\
 +	 po web web-1 WWW-1 WWW-2 WWW-post local-WWW-1 local-WWW-2\
 +	 web-install
  
  all:	 default
  	$(LOOP)
@@@ -148,10 -147,9 +148,9 @@@ installextradoc
  	-$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
  	cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package)
  
- include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
+ -include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep)
  
  $(outdir)/dummy.dep:
- 	@echo please ignore innocent warning about dummy.dep
  	-mkdir -p $(outdir)
  	touch $(outdir)/dummy.dep
  	echo '*' > $(outdir)/.gitignore
@@@ -170,31 -168,22 +169,31 @@@ $(config_make): $(top-src-dir)/configur
  	touch $@		# do something for multiple simultaneous configs.
  
  
 -################ website.
 +#### Documentation (website and tarball)
  
 -local-WWW:
 -local-WWW-post:
 +# documentation is built in two stages,
 +# plus WWW-post (only at toplevel)
 +# see INSTALL for more information.
 +
 +local-WWW-1:
 +local-WWW-2:
  web-install:
 +WWW-post:
  
 -WWW: local-WWW
 +WWW-1: local-WWW-1
  	$(LOOP)
  
 -WWW-post: local-WWW-post
 +WWW-2: local-WWW-2
  	$(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