Merge Trond

diff --git a/Makefile.am b/Makefile.am
index da5f16e2c96264468760613ca36f4ae6f5f98033..ea95090450919098f5d1f8488de0e896f402c389 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUFFIXES =
 PHONY =
 TESTS =
-CLEANFILES = 
+CLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
@@ -19,7 +19,7 @@ EXTRA_DIST = README.FIRST
 SUBDIRS = docs libhashkit
 
 test-docs:
-       (cd docs && make test-docs)
+       (cd docs && $(MAKE) test-docs)
 include libmemcached/include.am
 include clients/include.am
 include tests/include.am