Implement installcheck make target

diff --git a/Makefile.in b/Makefile.in
index fd06a6137c66c311994b9aef1e1b66d9068bc225..03d569da649e125d460c3ce23f39d985ca621428 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,11 +87,8 @@ check: test
 distclean: clean
        rm -f Makefile config.h config.log config.status
 
-# FIXME: To fix this, test.sh needs to be able to take ccache from the
-# installed prefix, not from the source dir.
 installcheck:
-       @echo "WARNING!  This is not really \"installcheck\" yet."
-       $(MAKE) check
+       CCACHE=$(bindir)/ccache ./test.sh
 
 check-syntax:
        $(CC) $(filter-out -M%, $(CPPFLAGS)) $(CFLAGS) -S -o /dev/null $(CHK_SOURCES)

diff --git a/NEWS b/NEWS
index 4ef9b6448a631db176a8527424adbf52853c21a4..1f2bdf143573d0547e83ea1972880ad313d27b9f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,8 @@ New features and improvements:
   - Standard error output from the compiler is now only stored in the cache if
     it's non-empty.
 
+  - Added installcheck make target.
+
 Bug fixes:
 
   - Fixed build on FreeBSD.

diff --git a/ccache.h b/ccache.h
index 20f5ad327cd859a1e61d89e88a2ebf46eb70c286..a111c18fa9127e5ad090edf48c280b738847160f 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -1,7 +1,7 @@
 #ifndef CCACHE_H
 #define CCACHE_H
 
-#define CCACHE_VERSION "2.4+jrosdahl"
+#define CCACHE_VERSION "2.4+direct.1"
 
 #include "config.h"
 

diff --git a/test.sh b/test.sh
index da9ff3798a6632b4bf5f3b434e384ed39ffef155..bfa9acc4f2b97a98f061f6e5624bcf6c3838207d 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -9,7 +9,9 @@ else
     COMPILER=cc
 fi
 
-CCACHE=$PWD/ccache
+if [ -z "$CCACHE" ]; then
+    CCACHE=$PWD/ccache
+fi
 TESTDIR=testdir.$$
 
 unset CCACHE_DISABLE