*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b972812037010aba1a8326a6087d27d4cb4107b5..e78a4ae4422b8697e7812eae08a241426c476401 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 
 2006-06-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * GNUmakefile.in (dist-toplevel-txt-files): new target. Don't
+       pollute src dir with built .txt files, but install directly from
+       Documentation/topdocs/out/
+
        * buildscripts/output-distance.py
        (ComparisonData.create_html_result_page): put version/directories
        in table header.

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 2659703f4fcebc312def7ece2d7148b32a7a5be7..d1ff8756518946d94481902703dd23292b2d51b3 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -13,3 +13,4 @@ endif
 
 $(outdir)/NEWS.nexi: NEWS.tely
 
+

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 83d1c1621c4a56fb74b9e483a09a0b5861cdb8e5..d448b41f8e332214409e5b7a53a656fc09b65c36 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,12 +18,13 @@ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
+TOPDOC_FILES=AUTHORS README INSTALL NEWS
+TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
+
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
 EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
-NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -32,6 +33,14 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+
+local-dist: dist-toplevel-txt-files
+
+
+dist-toplevel-txt-files:
+       -mkdir -p $(distdir)
+       ln $(TOPDOC_TXT_FILES) $(distdir)/
+
 doc: 
        $(MAKE) -C Documentation
 

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index ea288ca58c13a37693247fc2b1422d3af0a4684f..972d3fd671168a745c0915edf214f6ac40d40f82 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -69,6 +69,7 @@ Note that all commands recurse into subdirectories;\n\
 prepend \`local-' to restrict operation to the current directory.\n\
 Example: \`local-clean'.\n"
 
+# "
 local-help:
 
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)

diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make
index bfe076893fd12d62f7d2e7f39aa27a24befd11d7..ef2115d79f1abbd87d0473c09e5a07a1739a0435 100644 (file)
--- a/stepmake/stepmake/topdocs-targets.make
+++ b/stepmake/stepmake/topdocs-targets.make
@@ -1,9 +1,4 @@
 
 default: local-doc
 
-copy-to-top:  $(TO_TOP_FILES)
-       $(foreach i, $(TO_TOP_FILES), \
-         cp $(i) $(top-build-dir) && ) true
-
-local-WWW: $(HTML_FILES) $(PDF_FILES) copy-to-top
-
+local-WWW: $(HTML_FILES) $(PDF_FILES) $(TO_TOP_FILES)

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 9ba29c26367d13ed2680c1ee79654dce8bf532a2..9554110245634c3494b87b6b9617b02d5093a051 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -29,7 +29,7 @@ $(package-icon):
 
 
 do-top-doc:
-       -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top
+       -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" 
 
 
 $(README_TXT_FILES): do-top-doc