* Ignore test failures on non-i386/amd64 architectures (Closes:

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a45f4862086c21d8a30e3ccd7f9bc5e8fa128a63..0684e47b3144d2bd0b53845b4c5e3017b35bc7bc 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -23,8 +23,10 @@ TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/
 IN_FILES := $(call src-wildcard,*.in)
 
 RELEASE_FILES = ChangeLog RELEASE-COMMIT
-EXTRA_DIST_FILES = $(RELEASE_FILES) VERSION .gitignore lilypond-texi2html.init \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
+RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
+OUT_DIST_FILES += $(RELEASE_OUT_FILES)
+EXTRA_DIST_FILES = VERSION .gitignore \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -44,17 +46,16 @@ $(outdir)/VERSION: $(config_make) VERSION
        -mkdir -p $(outdir)
        echo $(TOPLEVEL_VERSION) > $@
 
-ChangeLog: $(outdir)/VERSION
+$(outdir)/ChangeLog: $(outdir)/VERSION
        @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?
+$(outdir)/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)
+       test -d $(top-src-dir)/.git && rm -f $(RELEASE_OUT_FILES)
+       $(MAKE) $(RELEASE_OUT_FILES)
 
 python-modules:
        $(MAKE) -C python
@@ -111,8 +112,8 @@ uninstall-WWW:
        $(MAKE) -C input/lsr uninstall
 
 
-# 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: