------------------------------------------------------------
revno: 13403
revision-id: kinkie@squid-cache.org-20140508132808-bdfnm3f8n6ze60vz
parent: squid3@treenet.co.nz-20140508101741-4veachmn9jloqrsj
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Thu 2014-05-08 15:28:08 +0200
message:
  Allow test suite to override make program via MAKE environment variable
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20140508132808-bdfnm3f8n6ze60vz
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 84e68069021cf80947d1b78e2667922d24bd9527
# timestamp: 2014-05-08 13:53:50 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140508101741-\
#   4veachmn9jloqrsj
# 
# Begin patch
=== modified file 'test-suite/buildtest.sh'
--- test-suite/buildtest.sh	2011-01-28 04:45:40 +0000
+++ test-suite/buildtest.sh	2014-05-08 13:28:08 +0000
@@ -42,7 +42,7 @@
 # but skip if we have no files to remove.
 FILECOUNT=`ls -1 | grep -c .`
 if test "${FILECOUNT}" != "0" ; then
-  make -k distclean || echo "distclean done. errors are unwanted but okay here."
+  ${MAKE:-make} -k distclean || echo "distclean done. errors are unwanted but okay here."
   ls -la .
   rm -fr ./src/fs/aufs/.deps src/fs/diskd/.deps
 fi
@@ -55,7 +55,7 @@
 # eval is need to correctly handle quoted arguments
 	eval "$base/../configure ${DISTCHECK_CONFIGURE_FLAGS} ${configcache}" \
 		2>&1 && \
-	make ${pjobs} ${MAKETEST} 2>&1
+	${MAKE:-make} ${pjobs} ${MAKETEST} 2>&1
 
 # Remember and then explicitly return the result of the last command
 # to the script caller. Probably not needed on most or all platforms.