Index: trunk/devel/run
===================================================================
--- trunk/devel/run	(revision 1062)
+++ trunk/devel/run	(revision 1095)
@@ -2,4 +2,5 @@
 # this script is for developers only
 set -e
+MAKE=/usr/bin/make
 
 . devel/run.cfg
@@ -10,5 +11,11 @@
 case "$type" in
 prep*)
-	exec ./devel/prepare
+	shift
+	exec $MAKE -f devel/prepare.mak "$@"
+	;;
+tags)
+	rm -f tags
+	shift
+	exec $MAKE -f devel/prepare.mak tags "$@"
 	;;
 dep*)
@@ -60,8 +67,5 @@
 	;;
 xtest)
-	exec /usr/bin/make -f devel/test.mak
-	;;
-tags)
-	exec ./devel/prepare tags
+	exec $MAKE -f devel/test.mak
 	;;
 esac
@@ -102,5 +106,5 @@
 phpize)
 	if [[ -r Makefile ]]; then
-		make xcachesvnclean || true
+		$MAKE xcachesvnclean || true
 	fi
 	;;
@@ -146,5 +150,5 @@
 esac
 
-LANG=C /usr/bin/make $MAKEOPTS "${MAKEARGS[@]}" 2>&1 \
+LANG=C $MAKE $MAKEOPTS "${MAKEARGS[@]}" 2>&1 \
 | sed -ur \
 	-e 's#Werror=implicit-function-declaration#We/rror=i/mplicit-function-declaration#' \
@@ -207,16 +211,16 @@
 	;;
 retest)
-	exec make xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`"
+	exec $MAKE xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`"
 	;;
 test)
 	case "${args[0]}" in
 	*.phpt)
-		exec make xcachetest TEST_ARGS=-v TESTS="${args[*]}"
+		exec $MAKE xcachetest TEST_ARGS=-v TESTS="${args[*]}"
 		;;
 	*/)
-		exec make xcachetest TESTS="${args[@]}"
+		exec $MAKE xcachetest TESTS="${args[@]}"
 		;;
 	*)
-		exec make xcachetest
+		exec $MAKE xcachetest
 		;;
 	esac
