Fix cyclic dependence with rest-collisions.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ef32c0080f5b15d09fb05ac3e8d28f43f4af929f..04ce4e6e726215fce75d53f56416475fb34ced8e 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -27,7 +27,7 @@ RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
 EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) website.make
+  $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -214,6 +214,8 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
                ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
+       -cd $(tree-share-prefix)/fonts/svg && \
+               ln -s ../../../../../../mf/$(outconfbase)/*.woff .
        -cd $(tree-share-prefix)/fonts/tfm && \
                ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
        -cd $(tree-share-prefix)/fonts/type1 && \
@@ -294,6 +296,6 @@ test-snippets-clean:
 website:
        $(MAKE) config_make=$(config_make) \
                top-src-dir=$(top-src-dir) \
-               -f $(top-src-dir)/website.make \
+               -f $(top-src-dir)/make/website.make \
                website