Build: end directories in their bare names and avoid some double slashes in logs.

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ac3ee69fc0bb71e67786ece5c0626509cf1a58f7..d4246294e5d7d2d3ab2c45602bee8cd9ca339324 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -84,7 +84,7 @@ INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 ifeq ($(out),www)
 INFO_IMAGES_DIR = lilypond
-DEST_INFO_IMAGES_SUBDIR = Documentation/
+DEST_INFO_IMAGES_SUBDIR = Documentation
 endif
 
 include $(depth)/make/stepmake.make
@@ -131,6 +131,18 @@ $(outdir)/essay.texi: \
   $(outdir)/computer-notation.itexi \
   $(outdir)/engravingbib.itexi
 
+$(outdir)/others-did.itexi:
+       BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
+               -s web \
+               -o $(outdir)/others-did.itexi \
+               $(src-dir)/web/others-did.bib
+
+$(outdir)/we-wrote.itexi:
+       BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
+               -s web \
+               -o $(outdir)/we-wrote.itexi \
+               $(src-dir)/web/we-wrote.bib
+
 
 ###########
 ### Targets
@@ -207,13 +219,19 @@ $(outdir)/pictures:
        $(MAKE) -C pictures WWW-1
        ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/web.texi: $(outdir)/ly-examples
-
 $(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 $@)