make check unconditional, check-maybe top-level.

 * Makefile.in: Add check-maybe target.
 * test/Makefile.in: Restore unconditional behaviour to make check.

2 files changed, 11 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index 9ab1f768da0..06e5b065701 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -921,6 +921,15 @@ extraclean: $(extraclean_dirs:=_extraclean)
 TAGS tags: lib lib-src src
         $(MAKE) -C src tags
 
+
+check-maybe: all
+        @if test ! -d test; then \
+          echo "You do not seem to have the test/ directory."; \
+          echo "Maybe you are using a release tarfile, rather than a repository checkout."; \
+        else \
+          $(MAKE) -C test check-maybe; \
+        fi
+
 check: all
         @if test ! -d test; then \
           echo "You do not seem to have the test/ directory."; \
@@ -943,7 +952,7 @@ $(DOCS):
         $(MAKE) -C doc/$(subst -, ,$@)
 
 .PHONY: $(DOCS) docs pdf ps
-.PHONY: info dvi dist check html info-real info-dir check-info
+.PHONY: info dvi dist check check-maybe html info-real info-dir check-info
 
 ## TODO add etc/refcards.
 docs: $(DOCS)
diff --git a/test/Makefile.in b/test/Makefile.in
index 06a2fb9ce31..1e76675ac76 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -136,7 +136,7 @@ $(foreach test,${TESTS},$(eval $(call test_template,${test})))
 
 ## Re-run all the tests every time.
 check:
-        -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
+        -@for f in $(LOGFILES); do test ! -f $$f || mv $$f $$f~; done
         @${MAKE} check-maybe
 
 ## Only re-run tests whose .log is older than the test.