diff options
| author | bde <bde@FreeBSD.org> | 1997-05-10 06:53:40 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-05-10 06:53:40 +0000 |
| commit | c1c52fcc298611fe5055e61f55880ff4d95bec54 (patch) | |
| tree | 25b08035d769258a65ea5208f8100c76b107e8b1 /Makefile | |
| parent | b4165ce57d8bdc4b485852e5d70e62bbeac172bd (diff) | |
| download | FreeBSD-src-c1c52fcc298611fe5055e61f55880ff4d95bec54.zip FreeBSD-src-c1c52fcc298611fe5055e61f55880ff4d95bec54.tar.gz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 2 insertions, 17 deletions
@@ -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 @@ -359,12 +350,6 @@ 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 # for the dependency information to be gathered from. |
