s/make/${MAKE}/g

22 files changed, 52 insertions, 52 deletions

diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index 78aa725cb41..a0c26c23903 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/03/08 10:53:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp 
 #
 
@@ -14,6 +14,6 @@ NO_WRKSUBDIR=	yes
 PATCH_STRIP=	-p2
 
 pre-configure:
-	@(cd ${WRKSRC}; make pre-install)
+	@(cd ${WRKSRC}; ${MAKE} pre-install)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 423fa5652bb..53f44992cff 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/06/18 16:15:11 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/03/08 10:53:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -24,7 +24,7 @@ pre-configure:
 	chmod +x ${WRKSRC}/configure
 
 post-build:
-	cd ${WRKSRC}/doc ; make info
+	cd ${WRKSRC}/doc ; ${MAKE} info
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/rplayd.sh ]; then \
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index ce073d46850..305bbbc33c8 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:16:44 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1999/03/08 10:53:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
@@ -15,6 +15,6 @@ USE_LIBTOOL=	yes
 INFO_FILES=	gdbm.info
 
 post-build:
-	cd ${WRKSRC} ; ${RM} gdbm.info ; make gdbm.info
+	cd ${WRKSRC} ; ${RM} gdbm.info ; ${MAKE} gdbm.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile
index 6582e60b5ee..012d7d1007b 100644
--- a/databases/py-mysql/Makefile
+++ b/databases/py-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1999/03/08 10:53:56 agc Exp $
 
 DISTNAME=	MySQLmodule-1.4
 PKGNAME=	py-mysql-1.4
@@ -20,7 +20,7 @@ do-configure:
 	${SED} -e 's,@PREFIX@,${PREFIX},' ${FILESDIR}/Setup.in \
 		>${WRKSRC}/Setup.in
 	${CP} ${PREFIX}/lib/python1.5/config/Makefile.pre.in ${WRKSRC}
-	(cd ${WRKSRC}; make -f Makefile.pre.in boot)
+	(cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot)
 	${CP} ${DISTDIR}/Mysqldb.py ${DISTDIR}/mysqlshelve.py ${WRKSRC}
 
 post-build:
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 1465769d29e..e886a57d3f6 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/07/14 15:55:38 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/03/08 10:53:56 agc Exp $
 #
 
 DISTNAME=	readline-2.2
@@ -13,7 +13,7 @@ USE_GTEXINFO=	yes
 SCRIPTS_ENV+=	PLIST_SRC="${PLIST_SRC}"
 
 do-build:
-	(cd ${WRKSRC}; make LIB=readline)
-	(cd ${WRKSRC}; make LIB=history)
+	(cd ${WRKSRC}; ${MAKE} LIB=readline)
+	(cd ${WRKSRC}; ${MAKE} LIB=history)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 3b987ccbdb1..8d82dc8c9ce 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/03/02 15:50:56 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/03/08 10:53:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
 #
 
@@ -17,6 +17,6 @@ INSTALL_TARGET=	install install-perl
 
 post-install:
 	@echo "You might want to copy the *.rc files from the source tree before"
-	@echo "doing \`make clean'."
+	@echo "doing \`${MAKE} clean'."
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 7ccca5326c9..8fe23679a30 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/03/02 15:50:56 agc Exp $
+# $NetBSD: Makefile,v 1.17 1999/03/08 10:53:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
@@ -32,7 +32,7 @@ SCREEN_TYPE=	x11
 
 post-install:
 	@${ECHO} "You might want to copy the *.rc files from the source tree before"
-	@${ECHO} "doing \`make clean'."
+	@${ECHO} "doing \`${MAKE} clean'."
 .if defined(USE_MENUS)
 	@${ECHO} "And also take a look at README.MENU !"
 .endif
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index e5857f14375..65f4e5929f0 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/12/27 01:52:07 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/03/08 10:53:56 agc Exp $
 
 DISTNAME=	Imaging-0.3b2
 PKGNAME=	py-imaging-0.3b2
@@ -19,10 +19,10 @@ do-configure:
 	(cd ${WRKSRC}/libImaging; CC="cc -fPIC" ./configure)
 	${SED} -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/Setup.in \
 		>${WRKSRC}/Setup.in
-	(cd ${WRKSRC}; make -f Makefile.pre.in boot)
+	(cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot)
 
 do-build:
-	(cd ${WRKSRC}/libImaging; make; cd ..; make)
+	(cd ${WRKSRC}/libImaging; ${MAKE}; cd ..; ${MAKE})
 
 post-build:
 	(cd ${WRKSRC}/PIL; python ${PREFIX}/lib/python1.5/compileall.py .)
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 45513cad583..37fbc12893f 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/08/20 15:17:04 tsarna Exp $
+# $NetBSD: Makefile,v 1.16 1999/03/08 10:53:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1998/01/27 01:11:47 fenner Exp
 #
 
@@ -25,6 +25,6 @@ post-extract:
 	${MV} ${WRKSRC}/example/rftp ${WRKSRC}/example/expect-rftp
 
 test:
-	@(cd ${WRKSRC}; make test)
+	@(cd ${WRKSRC}; ${MAKE} test)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 983149098d6..93165e3a69c 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/02/04 22:25:02 tv Exp $
+# $NetBSD: Makefile,v 1.19 1999/03/08 10:53:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} \
 MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}
 
 test:
-	@(cd ${WRKSRC}; make test)
+	@(cd ${WRKSRC}; ${MAKE} test)
 
 post-install:
 	@strip ${PREFIX}/bin/a2p
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index df10671f149..9915ac98b5e 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/08/31 20:58:04 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/03/08 10:53:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/01/06 06:38:33 max Exp
 #
 
@@ -21,7 +21,7 @@ ALL_TARGET=	goal
 INSTALL_TARGET=	install
 
 do-configure:
-	cd ${WRKSRC} ; make config
+	cd ${WRKSRC} ; ${MAKE} config
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fd ${PREFIX}/bin
diff --git a/net/rumba/Makefile b/net/rumba/Makefile
index 5db551b0a98..dc75f60dcd8 100644
--- a/net/rumba/Makefile
+++ b/net/rumba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/08/25 15:52:02 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/03/08 10:53:57 agc Exp $
 # $FreeBSD Id: Makefile,v 1.2 1997/07/21 19:28:46 max Exp
 #
 
@@ -21,7 +21,7 @@ post-extract:
 	@${LN} -s ${FILESDIR}/Makefile.unrumba ${WRKDIR}/unrumba/Makefile
 
 post-build:
-	cd ${WRKDIR}/unrumba && make
+	cd ${WRKDIR}/unrumba && ${MAKE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rumba ${PREFIX}/sbin
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index bf11523f610..b15a5d416e0 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/11/16 15:27:28 agc Exp $
+# $NetBSD: Makefile,v 1.16 1999/03/08 10:53:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp
 #
 
@@ -22,7 +22,7 @@ post-extract:
 	@${RM} -f ${WRKSRC}/../doc/http.n
 
 pre-install:
-	@cd ${WRKSRC};make sinstall
+	@cd ${WRKSRC};${MAKE} sinstall
 	@${CP} ${WRKSRC}/../tnm/ntping/ntping.8 ${WRKSRC}/../doc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 9a232b2b3e2..0a3085de57f 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/11/13 01:38:16 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1999/03/08 10:53:57 agc Exp $
 #
 
 DISTNAME=	sniffit.0.3.5
@@ -12,7 +12,7 @@ HOMEPAGE=	http://reptile.rug.ac.be/~coder/sniffit/sniffit.html
 NOT_FOR_ARCHS=	alpha	# severe LP64 loss
 
 do-build:
-	cd ${WRKSRC} ; ./configure ; make
+	cd ${WRKSRC} ; ./configure ; ${MAKE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin/sniffit
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 55af99c5ebe..a6dd931814a 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/03/04 13:51:17 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/03/08 10:53:57 agc Exp $
 #
 
 DISTNAME=	knews-1.0b.0
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/knews
 # DOMAIN_FILE to a file from which the domain name will be read.
 post-extract:
 .if !defined(DOMAIN_FILE) && !defined(DOMAIN_NAME)
-	@${ECHO_MSG} "Type \"make DOMAIN_NAME=xyz\" to set the domain name."
+	@${ECHO_MSG} "Type \"${MAKE} DOMAIN_NAME=xyz\" to set the domain name."
 .elif defined(DOMAIN_FILE)
 	@${ECHO_MSG} "Reading \"From:\" domain from file \"${DOMAIN_FILE}\"."
 .else
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index bef5497fc4e..5c0cb5f8e2f 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/12/18 00:42:40 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1999/03/08 10:53:57 agc Exp $
 
 DISTNAME=	pycrypt100
 PKGNAME=	py-crypto-1.0.0
@@ -30,10 +30,10 @@ do-configure:
 	@(cd ${WRKSRC}; ${PREFIX}/bin/python buildkit)
 	${CP} ${PREFIX}/lib/python1.5/config/Makefile.pre.in ${WRKSRC}/src
 	${CP} ${WRKSRC}/Setup.in ${WRKSRC}/src
-	@(cd ${WRKSRC}/src; make -f Makefile.pre.in boot)
+	@(cd ${WRKSRC}/src; ${MAKE} -f Makefile.pre.in boot)
 
 do-build:
-	@(cd ${WRKSRC}/src; make)
+	@(cd ${WRKSRC}/src; ${MAKE})
 	${PREFIX}/bin/python ${PREFIX}/lib/python1.5/compileall.py \
 		${WRKSRC}/Lib
 	${PREFIX}/bin/python -O ${PREFIX}/lib/python1.5/compileall.py \
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 7529881e8a3..d4876e984e7 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/02/23 08:45:48 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/03/08 10:53:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/13 23:29:52 jmz Exp
 #
 
@@ -31,12 +31,12 @@ DISTFILES+=	${EXTRA_DICT}
 
 pre-extract:
 .ifndef ISPELL_LANG
-	@${ECHO} '******************************************************'
-	@${ECHO} '* Note that you can build a british version by       *'
-	@${ECHO} '* typing "make british" following a "make clean"     *'
-	@${ECHO} '* Note that you can build a french/english version   *'
-	@${ECHO} '* by typing "make french"                            *'
-	@${ECHO} '******************************************************'
+	@${ECHO} '*******************************************************'
+	@${ECHO} '* Note that you can build a british version by        *'
+	@${ECHO} '* typing "${MAKE} british" following a "${MAKE} clean"*'
+	@${ECHO} '* Note that you can build a french/english version    *'
+	@${ECHO} '* by typing "${MAKE} french"                          *'
+	@${ECHO} '*******************************************************'
 .endif
 
 pre-configure:
diff --git a/www/squid-current/Makefile b/www/squid-current/Makefile
index 6dfca811ace..7b546e42539 100644
--- a/www/squid-current/Makefile
+++ b/www/squid-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1999/03/08 10:53:57 agc Exp $
 #
 
 DISTNAME=	squid-2.1.PATCH2
@@ -58,7 +58,7 @@ pre-install:
 	) > ${WRKDIR}/PLIST.share
 
 post-install:
-	cd ${WRKSRC}/src; make install-pinger
+	cd ${WRKSRC}/src; ${MAKE} install-pinger
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
 	@${SETENV} ${MAKE_ENV} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8d293b45926..404f2d2a272 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/03/08 10:53:57 agc Exp $
 #
 
 DISTNAME=	squid-2.0.PATCH2
@@ -52,7 +52,7 @@ pre-install:
 	) > ${WRKDIR}/PLIST.share
 
 post-install:
-	cd ${WRKSRC}/src; make install-pinger
+	cd ${WRKSRC}/src; ${MAKE} install-pinger
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
 	@${SETENV} ${MAKE_ENV} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
diff --git a/www/zope/Makefile b/www/zope/Makefile
index 3511dc6f000..46e0bbbc290 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/03/08 10:53:58 agc Exp $
 #
 
 DISTNAME=	Zope-1.9.0-src
@@ -19,7 +19,7 @@ do-configure:
 	${SED} -e "s,@PREFIX@,${PREFIX}," \
 		<${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile
 	(cd ${WRKSRC}; rm -rf lib/Components/zlib)
-	(cd ${WRKSRC}; make configure)
+	(cd ${WRKSRC}; ${MAKE} configure)
 
 do-install:
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index a8401636f2c..2cfb3142cb3 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:55 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/03/08 10:53:58 agc Exp $
 
 DISTNAME=		AfterStep-1.0
 PKGNAME=		fvwm-wharf-1.0
@@ -13,7 +13,7 @@ DEPENDS=		xpm-3.4k:../../graphics/xpm
 USE_X11BASE=		yes
 
 do-configure:
-	(cd ${WRKSRC} ; xmkmf ; make Makefiles)
+	(cd ${WRKSRC} ; xmkmf ; ${MAKE} Makefiles)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 9e4697f1b3f..96051a36303 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/03/01 23:09:12 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/03/08 10:53:58 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -17,7 +17,7 @@ CONFLICTS=	fvwm-1.*
 
 USE_IMAKE=	yes
 # drop -a because we have no `depends' target
-XMKMF=		${SH} -c "xmkmf && make Makefiles"
+XMKMF=		${SH} -c "xmkmf && ${MAKE} Makefiles"
 
 post-extract:
 	cd ${WRKSRC}/modules; \