make check unconditional, check-maybe top-level.

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

diff --git a/Makefile.in b/Makefile.in
index 9ab1f768da04bc4fb980d8121189910e8c63fd24..06e5b06570117dcb9a47a8c73c6a03fb51b942e2 100644 (file)
--- 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 06a2fb9ce315a8d2c9fc563a7d24a44c7a0c3ceb..1e76675ac76207cdd2e1d1c9bdb709c5c4cb3e55 100644 (file)
--- 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.