X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=d5480cf7b172056c7f2bb7ceb1a7befcaf768704;hb=fcfde38d0df59e68f9a33744ef5406891b65c253;hp=a88ed6c9d6b0f549a4bf61af866a5a924483d848;hpb=525fcaecb829de8c680ad36151d8532da8e35219;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a88ed6c9d6..d5480cf7b1 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,12 +17,13 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING ChangeLog DEDICATION ROADMAP THANKS HACKING
+README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
 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)
 
-EXTRA_DIST_FILES = VERSION .gitignore lilypond-texi2html.init \
+RELEASE_FILES = ChangeLog RELEASE-COMMIT
+EXTRA_DIST_FILES = $(RELEASE_FILES) VERSION .gitignore lilypond-texi2html.init \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -35,7 +36,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-local-dist: dist-toplevel-txt-files 
+local-dist: refresh-release-files dist-toplevel-txt-files 
 
 all: $(outdir)/VERSION
 
@@ -44,44 +45,64 @@ $(outdir)/VERSION: $(config_make) VERSION
 	echo $(TOPLEVEL_VERSION) > $@
 
 ChangeLog: $(outdir)/VERSION
-	@echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > ChangeLog
+	@echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@
+
+RELEASE-COMMIT: # FIXME: any file in $(top-src-dir)/.git/ we can depend on and be sure RELEASE-COMMIT is up to date?
+	git --git-dir=$(top-src-dir)/.git show HEAD | head -100 > $@
+
+# junk me as soon as RELEASE-COMMIT FIXME: has been addressed
+refresh-release-files:
+	rm -f ChangeLog
+	test -d $(top-src-dir)/.git && rm -f RELEASE-COMMIT
+	$(MAKE) $(RELEASE_FILES)
 
 python-modules:
 	$(MAKE) -C python
 
-do-top-doc: python-modules
+top-doc: python-modules
 
 local-clean: local-clean-ChangeLog
 
 local-clean-ChangeLog:
 	rm -f ChangeLog
 
-dist-toplevel-txt-files: do-top-doc
+dist-toplevel-txt-files: top-doc
 	-mkdir -p $(distdir)
 	ln $(TOPDOC_TXT_FILES) $(distdir)/
 	ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
 
-doc: 
-	$(MAKE) -C Documentation
+info:
+	$(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true
+
+install-info: info
+	$(MAKE) out=www COPY_INFO_IMAGES=1 install-info-WWW
 
 install-help2man:
 	$(MAKE) -C scripts man install-help2man
 	$(MAKE) -C lily man install-help2man
 
+install-doc:
+	$(MAKE) out=www install-WWW
+	$(MAKE) out=www install-info-WWW
+
+uninstall-doc:
+	$(MAKE) out=www uninstall-WWW
+
+local-install:
+	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
+
+final-install:
+	@true
+
+ifeq ($(out),www)
 # All web targets, except info image symlinks and info docs are
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
 	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-	rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+	rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
 
 install-info-WWW:
-	$(MAKE) -C Documentation/user install-info
-	$(MAKE) -C input/lsr install-info
-	(cd $(DESTDIR)$(infodir) && rm -f lilypond && ln -sf $(shell $(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/Documentation/user) lilypond)
-
-web-install:
-	$(MAKE) out=www install-WWW
-	$(MAKE) out=www install-info-WWW
+	$(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true
 
 uninstall-WWW:
 	rm -rf $(DESTDIR)$(webdir)
@@ -89,18 +110,9 @@ uninstall-WWW:
 	$(MAKE) -C Documentation/user uninstall
 	$(MAKE) -C input/lsr uninstall
 
-web-uninstall:
-	$(MAKE) out=www uninstall-WWW
-
-local-install:
-	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
-
-final-install:
-	@true
-
 
-# For online docs with content negotiation, issue `make web WEB_TARGETS=online'
-# For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
+# For online docs with content negotiation, issue `make doc WEB_TARGETS=online'
+# For both online and offline docs, issue `make doc WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
 WWW-post:
@@ -110,6 +122,7 @@ 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
 
 
 tree-prefix = $(outdir)
@@ -129,7 +142,7 @@ c-clean:
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-web-clean: snippets-clean $(tree-share-prefix)/lilypond-force
+doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force
 
 default: $(config_h) build-dir-setup