Merge remote branch 'origin' into release/unstable

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index e061e629c836bf98e3cb1764c98069d62820746d..19ae57769883b1d8f3667373d426ed2c1bc98544 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -32,7 +32,7 @@ README_TOP_FILES= DEDICATION THANKS
 IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
 SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
 
-EXTRA_DIST_FILES = $(call src-wildcard,*.init)
+EXTRA_DIST_FILES = $(call src-wildcard,*.init) $(call src-wildcard,*.bst)
 
 ### Out files
 
@@ -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
@@ -113,16 +113,19 @@ $(outdir)/contributor.texi: $(outdir)/ROADMAP
 ### bad hack for badly-integrated bibliography
 $(outdir)/colorado.itexi:
        BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+               -s $(top-src-dir)/Documentation/lily-bib \
                -o $(outdir)/colorado.itexi \
                $(src-dir)/essay/colorado.bib
 
 $(outdir)/computer-notation.itexi:
        BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+               -s $(top-src-dir)/Documentation/lily-bib \
                -o $(outdir)/computer-notation.itexi \
                $(src-dir)/essay/computer-notation.bib
 
 $(outdir)/engravingbib.itexi:
        BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+               -s $(top-src-dir)/Documentation/lily-bib \
                -o $(outdir)/engravingbib.itexi \
                $(src-dir)/essay/engravingbib.bib
 
@@ -133,13 +136,13 @@ $(outdir)/essay.texi: \
 
 $(outdir)/others-did.itexi:
        BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
-               -s web \
+               -s $(top-src-dir)/Documentation/lily-bib \
                -o $(outdir)/others-did.itexi \
                $(src-dir)/web/others-did.bib
 
 $(outdir)/we-wrote.itexi:
        BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
-               -s web \
+               -s $(top-src-dir)/Documentation/lily-bib \
                -o $(outdir)/we-wrote.itexi \
                $(src-dir)/web/we-wrote.bib