From b02cab92aa15f36582a165f90f64e4a0cf6e2aff Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 10 May 1997 06:53:40 +0000
Subject: [PATCH] Use `mk' files in share/mk (relative to the top level of the
 source tree) instead of the system default ones in /usr/share/mk.  This only
 works for makes run from the top level, and a few not too out of date system
 makefiles must be present to start up.  Bootstraps from can still be done
 from scratch by giving the path to an up to date share/mk on the command
 line.

Removed bootstrap `mk' target and use of it.  The bootstrap didn't
actually work for the non-null DESTDIR case.
---
 Makefile | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 9e837e3e024..9695dca879f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.122 1997/04/30 16:02:03 bde Exp $
+#	$Id: Makefile,v 1.123 1997/05/03 02:51:58 jb Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -33,6 +33,7 @@
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
+.MAKEFLAGS:=	${.MAKEFLAGS} -m ${.CURDIR}/share/mk
 
 # Put initial settings here.
 SUBDIR=
@@ -155,11 +156,6 @@ world:
 	cd ${.CURDIR} && ${MAKE} hierarchy
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding /usr/share/mk"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} mk
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo " Cleaning up the source tree"
 	@echo "--------------------------------------------------------------"
 .if defined(NOCLEAN)
@@ -250,11 +246,6 @@ reinstall:
 	cd ${.CURDIR} && ${MAKE} hierarchy
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding /usr/share/mk"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} mk
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo " Installing everything.."
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR} && ${MAKE} install
@@ -358,12 +349,6 @@ installmost:
 hierarchy:
 	cd ${.CURDIR}/etc &&		${MAKE} distrib-dirs
 
-#
-# mk - update the /usr/share/mk makefiles.
-#
-mk:
-	cd ${.CURDIR}/share/mk &&	${MAKE} install
-
 #
 # bootstrap - [re]build tools needed to run the actual build, this includes
 # tools needed by 'make depend', as some tools are needed to generate source