From: Graham Percival <gperciva@futoi.(none)>
Date: Mon, 23 Aug 2010 23:24:27 +0000 (+0100)
Subject: Build: another fix for make dist.
X-Git-Tag: release/2.13.31-1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=02a744b46e6c48934586e8db97a88d1d8487e9e8;p=lilypond.git

Build: another fix for make dist.
---

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 457d2664a0..e061e629c8 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -143,9 +143,6 @@ $(outdir)/we-wrote.itexi:
 		-o $(outdir)/we-wrote.itexi \
 		$(src-dir)/web/we-wrote.bib
 
-# duplicate (without ly-examples) of later www-only definition
-$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
-
 
 ###########
 ### Targets
@@ -222,13 +219,19 @@ $(outdir)/pictures:
 	$(MAKE) -C pictures WWW-1
 	ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/web.texi: $(outdir)/ly-examples $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
-
 $(outdir)/ly-examples:
 	$(MAKE) -C web/ly-examples
 	ln -sf ../web/ly-examples/$(outdir) $@
 endif
 
+ifeq ($(out),www)
+$(outdir)/web.texi: $(outdir)/ly-examples $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+else
+# duplicate (without ly-examples)
+$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+endif
+
+
 # Ugh, using '%' twice not possible
 $(outdir)/notation/notation.xml: $(outdir)/notation.texi
 	mkdir -p $(dir $@)
diff --git a/Documentation/web/GNUmakefile b/Documentation/web/GNUmakefile
index 37ce914f53..0435d91702 100644
--- a/Documentation/web/GNUmakefile
+++ b/Documentation/web/GNUmakefile
@@ -1,12 +1,11 @@
 depth = ../..
 
-STEPMAKE_TEMPLATES=tex documentation
-LOCALSTEPMAKE_TEMPLATES = lilypond ly
+LOCALSTEPMAKE_TEMPLATES = ly
 
 SUBDIRS = ly-examples server
 include $(depth)/make/stepmake.make
 
-OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
-EXTRA_DIST_FILES= $(BIB_FILES) $(call src-wildcard,*.bst)
-BIB_FILES= $(call src-wildcard,*.bib)
+#OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
+BIB_FILES = $(call src-wildcard,*.bib)
+EXTRA_DIST_FILES += $(BIB_FILES) $(call src-wildcard,*.bst)