Use $(MAKE) instead of make to fix the build if GNU make is called something else on the system.

Original commit message from CVS:
* check.mak:
* coverage/lcov.mak:
* gtk-doc-plugins.mak:
* release.mak:
Use $(MAKE) instead of make to fix the build if GNU make is called
something else on the system.
* m4/as-docbook.m4:
Fix path for docbook.xsl if we have no /etc/xml/catalog and add a
docbook-xsl search path for FreeBSD.

1 files changed, 5 insertions, 5 deletions

diff --git a/check.mak b/check.mak
index 9ac509d..d31569f 100644
--- a/check.mak
+++ b/check.mak
@@ -6,7 +6,7 @@ clean-local-check:
 if HAVE_VALGRIND
 # hangs spectacularly on some machines, so let's not do this by default yet
 check-valgrind:
-	make valgrind
+	$(MAKE) valgrind
 else
 check-valgrind:
 	@true
@@ -71,7 +71,7 @@ LOOPS = 10
 	
 # valgrind any given test until failure by running make test.valgrind-forever
 %.valgrind-forever: %
-	@while make $*.valgrind; do				\
+	@while $(MAKE) $*.valgrind; do				\
 	  true; done
 
 # gdb any given test by running make test.gdb
@@ -86,7 +86,7 @@ torture: $(TESTS)
 	-rm test-registry.xml
 	@echo "Torturing tests ..."
 	for i in `seq 1 $(LOOPS)`; do				\
-		make check ||					\
+		$(MAKE) check ||					\
 		(echo "Failure after $$i runs"; exit 1) ||	\
 		exit 1;						\
 	done
@@ -99,7 +99,7 @@ forever: $(TESTS)
 	-rm test-registry.xml
 	@echo "Forever tests ..."
 	while true; do						\
-		make check ||					\
+		$(MAKE) check ||					\
 		(echo "Failure"; exit 1) ||			\
 		exit 1;						\
 	done
@@ -109,7 +109,7 @@ valgrind: $(TESTS)
 	@echo "Valgrinding tests ..."
 	@failed=0;							\
 	for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do	\
-		make $$t.valgrind;					\
+		$(MAKE) $$t.valgrind;					\
 		if test "$$?" -ne 0; then                               \
                         echo "Valgrind error for test $$t";		\
 			failed=`expr $$failed + 1`;			\