diff --git a/en/FAQ/Makefile b/en/FAQ/Makefile
index cb970b79a5..35bd3e6fa3 100644
--- a/en/FAQ/Makefile
+++ b/en/FAQ/Makefile
@@ -1,11 +1,11 @@
 #
-# $FreeBSD$
+# $FreeBSD: www/en/FAQ/Makefile,v 1.3 1999/09/06 07:02:39 peter Exp $
 #
 # Build the FreeBSD FAQ *outside* of the www tree, and install it
 # in to the right place as necessary.
 
 all install clean:
-	(cd ../../../doc/en_US.ISO_8859-1/books/faq && make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/FAQ ${.TARGET})
+	(cd ../../../doc/en_US.ISO_8859-1/books/faq && ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/FAQ ${.TARGET})
 .if make(install)
 	(cd ${DESTDIR}/data/FAQ; ln -sf index.html FAQ.html)
 .endif
diff --git a/en/handbook/Makefile b/en/handbook/Makefile
index eb185625c1..4ba2e70d7c 100644
--- a/en/handbook/Makefile
+++ b/en/handbook/Makefile
@@ -1,18 +1,18 @@
 #
-# $FreeBSD$
+# $FreeBSD: www/en/handbook/Makefile,v 1.4 1999/09/06 07:02:45 peter Exp $
 #
 # Build the FreeBSD Handbook *outside* of the www tree, and install it
 # in to the right place as necessary.
 #
 # The Handbook is no longer completely self contained in 
 # doc/en_US.ISO_8859-1/books/handbook, (it requires support files outside of 
 # this directory) and it is much simpler to build it outside the web tree 
 # than it is to make a nest of symlinks to try and build it inside the tree.
 #
 # This assumes that you have the www/ and doc/ trees checked out beside
 # one another -- this was always the case anyway, so there are no extra
 # requirements here.
 #
 
 all install clean:
-	(cd ../../../doc/en_US.ISO_8859-1/books/handbook && make FORMATS=html-split DESTDIR=${DESTDIR}/data/handbook ${.TARGET})
+	(cd ../../../doc/en_US.ISO_8859-1/books/handbook && ${MAKE} FORMATS=html-split DESTDIR=${DESTDIR}/data/handbook ${.TARGET})
diff --git a/en/internal/Makefile b/en/internal/Makefile
index 1cc980eb2b..39c011a03c 100644
--- a/en/internal/Makefile
+++ b/en/internal/Makefile
@@ -1,41 +1,41 @@
-# $FreeBSD: www/en/internal/Makefile,v 1.15 1999/09/06 07:02:45 peter Exp $
+# $FreeBSD: www/en/internal/Makefile,v 1.16 1999/09/15 20:34:35 wosch Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 
 DOCS=	photos.sgml	
 DOCS+=	internal.sgml	
 DOCS+= 	about.sgml
 DOCS+= 	machines.sgml
 DOCS+= 	mirror.sgml
 DOCS+=	statistic.sgml
 DOCS+= 	developer.sgml
 
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 LOCAL=  committers-guide.html
 .endif
 
 committers-guide.html: ../../../doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml
-	(cd ../../../doc/en_US.ISO_8859-1/articles/committers-guide && make FORMATS=html INSTALL_COMPRESSED='')
+	(cd ../../../doc/en_US.ISO_8859-1/articles/committers-guide && ${MAKE} FORMATS=html INSTALL_COMPRESSED='')
 	cp ../../../doc/en_US.ISO_8859-1/articles/committers-guide/article.html committers-guide.html
 
 INDEXLINK=	internal.html
 
 # build the list of personal homepages of FreeBSD developers only 
 # on the main FreeBSD machines
 hostname!= hostname
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
 DOCS+=	homepage.sgml
 .PHONY: homepage.inc
 
 homepage.inc:
 	perl homepage.pl > ${.TARGET}
 
 homepage.sgml:  homepage.inc
 CLEANFILES+=	homepage.inc
 .endif
 
 DATA+=	README.mirror
 
 .include "../web.mk"
diff --git a/en/tutorials/Makefile b/en/tutorials/Makefile
index 8f4a8d7728..35521d5f1c 100644
--- a/en/tutorials/Makefile
+++ b/en/tutorials/Makefile
@@ -1,13 +1,13 @@
 #
-# $FreeBSD$
+# $FreeBSD: www/en/tutorials/Makefile,v 1.3 1999/09/06 07:02:58 peter Exp $
 #
 # Build the FreeBSD tutorials/articles outside of the www tree, and then
 # install them in to the right place.
 
 DOCS = index.sgml
 
 all afterinstall clean: index.html
-	(cd ../../../doc/en_US.ISO_8859-1/articles && make 'FORMATS=html html-split' 'DESTDIR=${DESTDIR}/data/tutorials/$${.CURDIR:T}' ${.TARGET:S/afterinstall/install/})
-	(cd ../../../doc/en_US.ISO_8859-1/books/fdp-primer && make 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/docproj-primer ${.TARGET:S/afterinstall/install/})
+	(cd ../../../doc/en_US.ISO_8859-1/articles && ${MAKE} 'FORMATS=html html-split' 'DESTDIR=${DESTDIR}/data/tutorials/$${.CURDIR:T}' ${.TARGET:S/afterinstall/install/})
+	(cd ../../../doc/en_US.ISO_8859-1/books/fdp-primer && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/docproj-primer ${.TARGET:S/afterinstall/install/})
 
 .include "../web.mk"
diff --git a/es/FAQ/Makefile b/es/FAQ/Makefile
index 5a4eb9bec0..abce1b0c27 100644
--- a/es/FAQ/Makefile
+++ b/es/FAQ/Makefile
@@ -1,11 +1,11 @@
 #
-# $FreeBSD$
+# $FreeBSD: www/es/FAQ/Makefile,v 1.2 1999/09/06 07:03:00 peter Exp $
 #
 # Build the FreeBSD FAQ *outside* of the www tree, and install it
 # in to the right place as necessary.
 
 all install clean:
-	(cd ../../../doc/es_ES.ISO_8859-1/books/faq; make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/es/FAQ ${.TARGET})
+	(cd ../../../doc/es_ES.ISO_8859-1/books/faq; ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/es/FAQ ${.TARGET})
 .if make(install)
 	(cd ${DESTDIR}/data/es/FAQ; ln -sf index.html FAQ.html)
 .endif
diff --git a/ja/FAQ/Makefile b/ja/FAQ/Makefile
index 0d6e86f9da..24e909ac1a 100644
--- a/ja/FAQ/Makefile
+++ b/ja/FAQ/Makefile
@@ -1,12 +1,12 @@
 #
-# $FreeBSD: www/ja/FAQ/Makefile,v 1.3 1999/09/06 07:03:16 peter Exp $
+# $FreeBSD: www/ja/FAQ/Makefile,v 1.4 1999/09/07 15:15:46 kuriyama Exp $
 # Original revision:	1.3
 #
 # Build the FreeBSD FAQ *outside* of the www tree, and install it
 # in to the right place as necessary.
 
 all install clean:
-	(cd ../../../doc/ja_JP.eucJP/books/faq && make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/ja/FAQ ${.TARGET})
+	(cd ../../../doc/ja_JP.eucJP/books/faq && ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/ja/FAQ ${.TARGET})
 .if make(install)
 	(cd ${DESTDIR}/data/ja/FAQ; ln -sf index.html FAQ.html)
 .endif
diff --git a/ja/handbook/Makefile b/ja/handbook/Makefile
index 51bdc031a6..73de211a59 100644
--- a/ja/handbook/Makefile
+++ b/ja/handbook/Makefile
@@ -1,19 +1,19 @@
 #
-# $FreeBSD: www/ja/handbook/Makefile,v 1.5 1999/09/06 07:03:19 peter Exp $
+# $FreeBSD: www/ja/handbook/Makefile,v 1.6 1999/09/07 15:15:48 kuriyama Exp $
 # Original revision:	1.4
 #
 # Build the FreeBSD Handbook *outside* of the www tree, and install it
 # in to the right place as necessary.
 #
 # The Handbook is no longer completely self contained in 
 # doc/ja_JP.eucJP/books/handbook, (it requires support files outside of 
 # this directory) and it is much simpler to build it outside the web tree 
 # than it is to make a nest of symlinks to try and build it inside the tree.
 #
 # This assumes that you have the www/ and doc/ trees checked out beside
 # one another -- this was always the case anyway, so there are no extra
 # requirements here.
 #
 
 all install clean:
-	(cd ../../../doc/ja_JP.eucJP/books/handbook && make FORMATS=html-split DESTDIR=${DESTDIR}/data/ja/handbook ${.TARGET})
+	(cd ../../../doc/ja_JP.eucJP/books/handbook && ${MAKE} FORMATS=html-split DESTDIR=${DESTDIR}/data/ja/handbook ${.TARGET})
diff --git a/ru/FAQ/Makefile b/ru/FAQ/Makefile
index d8dba24549..a5e3ca0dd5 100644
--- a/ru/FAQ/Makefile
+++ b/ru/FAQ/Makefile
@@ -1,11 +1,11 @@
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/FAQ/Makefile,v 1.3 1999/09/06 07:03:31 peter Exp $
 #
 # Build the FreeBSD FAQ *outside* of the www tree, and install it
 # in to the right place as necessary.
 
 all install clean:
-	(cd ../../../doc/ru_RU.KOI8-R/books/faq; make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/ru/FAQ ${.TARGET})
+	(cd ../../../doc/ru_RU.KOI8-R/books/faq; ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/ru/FAQ ${.TARGET})
 .if make(install)
 	(cd ${DESTDIR}/data/ru/FAQ; ln -sf index.html FAQ.html)
 .endif
diff --git a/zh/FAQ/Makefile b/zh/FAQ/Makefile
index c70c91cf4c..beeb99f512 100644
--- a/zh/FAQ/Makefile
+++ b/zh/FAQ/Makefile
@@ -1,11 +1,11 @@
 #
-# $FreeBSD$
+# $FreeBSD: www/zh/FAQ/Makefile,v 1.2 1999/09/06 07:03:31 peter Exp $
 #
 # Build the FreeBSD FAQ *outside* of the www tree, and install it
 # in to the right place as necessary.
 
 all install clean:
-	(cd ../../../doc/zh_TW.Big5/books/faq; make 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/zh/FAQ ${.TARGET})
+	(cd ../../../doc/zh_TW.Big5/books/faq; ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/zh/FAQ ${.TARGET})
 .if make(install)
 	(cd ${DESTDIR}/data/zh/FAQ; ln -sf index.html FAQ.html)
 .endif