X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=2860088095b5bf9b6255fff634717da4c432c8db;hb=37a1acdcb64020041d724e42e3e41b921e655709;hp=67a72886da1dab79bdcd43d73ffb6860fb6d67f9;hpb=3a9c1df02fdb6846418c5794a7b04d07209e95b3;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 67a72886da..2860088095 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,7 +17,8 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
+README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \
+  LICENSE LICENSE.DOCUMENTATION
 TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
@@ -25,7 +26,7 @@ IN_FILES := $(call src-wildcard,*.in)
 RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
-EXTRA_DIST_FILES = VERSION .gitignore \
+EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
   $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -101,6 +102,7 @@ ifeq ($(out),www)
 install-WWW:
 	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
 	rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+	$(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
 	$(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true
@@ -122,8 +124,13 @@ WWW-post:
 	find $(outdir) -name '*-root' | xargs rm -rf
 	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
 	find $(outdir)/offline-root -type l -delete
-endif
+	cd $(outdir)/offline-root/Documentation && ln -sf ./ v$(MAJOR_VERSION).$(MINOR_VERSION)
+endif # ifeq ($(out),www)
 
+# For those who cannot for the life in them remember to type
+# WEB_TARGETS=..., just bloody make all doc stuff, already.
+all-doc:
+	$(MAKE) WEB_TARGETS='online offline' doc
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -233,6 +240,14 @@ grand-replace:
 	$(MAKE) -C scripts/build
 	PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
+
+################################################################
+# website (without the rest of the docs)
+web-version:
+	touch $(top-src-dir)/Documentation/web.texi
+	cd $(top-build-dir)/Documentation && make out=www WEB_VERSION=yes out-www/web/index.html
+
+
 ################################################################
 # testing
 
@@ -245,6 +260,7 @@ test:
 	@echo
 	$(MAKE) -C input/regression/ out=test local-test
 	$(MAKE) -C input/regression/musicxml out=test local-test
+	$(MAKE) -C input/regression/abc2ly out=test local-test
 
 test-baseline: 
 	@if test -d .git ; then \
@@ -254,6 +270,7 @@ test-baseline:
 	$(MAKE) test
 	$(MAKE) out=test -C input/regression/ local-test-baseline
 	$(MAKE) out=test -C input/regression/musicxml local-test-baseline
+	$(MAKE) out=test -C input/regression/abc2ly local-test-baseline
 	$(MAKE) test-snippets-clean