Build: Fix `make dist', include the files added in recent commits.

diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index 17eb63922e87ae315226b1433ed2de8241d632f1..b617fc99cd7dc1be42fa10f140a4317659ce5887 100644 (file)
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -6,6 +6,7 @@ STEPMAKE_TEMPLATES = documentation texinfo
 
 TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard,ChangeLog*[0-9]) $(call src-wildcard,NEWS-*[0-9])
 EXTRA_DIST_FILES = $(TEXTS)
+EXTRA_DIST_FILES += $(call src-wildcard,*.html)
 
 include $(depth)/make/stepmake.make
 

diff --git a/input/regression/lilypond-book/GNUmakefile b/input/regression/lilypond-book/GNUmakefile
index ff6cd10b481b54ed7e7e2b6de5910cb28c2bd8f6..3f27361283c00b4815715fd08857a5e5205399d7 100644 (file)
--- a/input/regression/lilypond-book/GNUmakefile
+++ b/input/regression/lilypond-book/GNUmakefile
@@ -7,6 +7,8 @@ include $(depth)/make/stepmake.make
 
 TITLE=lilypond-book Test Suite
 
+SUBDIRS=include
+
 COLLATED_FILES = $(OUT_FILES)
 
 EXTRA_DIST_FILES = include.mxl

diff --git a/input/regression/lilypond-book/include/GNUmakefile b/input/regression/lilypond-book/include/GNUmakefile
new file mode 100644 (file)
index 0000000..0b6e885
--- /dev/null
+++ b/input/regression/lilypond-book/include/GNUmakefile
@@ -0,0 +1,11 @@
+depth = ../../../..
+
+STEPMAKE_TEMPLATES=
+LOCALSTEPMAKE_TEMPLATES=
+
+include $(depth)/make/stepmake.make
+
+EXTRA_DIST_FILES += $(call src-wildcard,*.ly)
+EXTRA_DIST_FILES += $(call src-wildcard,*.ily)
+EXTRA_DIST_FILES += $(call src-wildcard,*.tely)
+EXTRA_DIST_FILES += $(call src-wildcard,*.itely)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 490e2066ef047f55d3ff9fbed12612096620f8c9..8be2cab11dbe82218add1190679c27782c3b57b8 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -419,7 +419,7 @@ EOF
 
        abssrcdir="`cd $srcdir; pwd`"
        absbuilddir="`pwd`"
-       for d in 2 3 4 ; do
+       for d in 2 3 4 5 ; do
            for mf in `cd $srcdir ; find . -maxdepth $d -mindepth $d -name GNUmakefile`; do
                case "$abssrcdir" in
                    "$absbuilddir"/*)