diff options
author | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
commit | 8eb37231d4405088a481324c2ec41ac851e8d8f7 (patch) | |
tree | dc80da53186aab7c56424c2574b0cd7928930721 /Makefile | |
parent | 3acbd3cce674dab9a0afdee1f6e50196f4585ffa (diff) | |
download | FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.zip FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.tar.gz |
Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 29 |
1 files changed, 6 insertions, 23 deletions
@@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.83 1996/06/20 18:47:04 jkh Exp $ +# $Id: Makefile,v 1.84 1996/06/22 17:58:44 pst Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -112,7 +112,7 @@ world: pre-world hierarchy mk $(WORLD_CLEANDIST) bootstrap include-tools include @echo " Rebuilding ${DESTDIR} The whole thing" @echo "--------------------------------------------------------------" @echo - ${MAKE} depend all install + cd ${.CURDIR} && ${MAKE} depend all install cd ${.CURDIR}/share/man && ${MAKE} makedb .if target(post-world) cd ${.CURDIR} && ${MAKE} post-world @@ -132,7 +132,7 @@ reinstall: hierarchy mk includes @echo " Reinstall ${DESTDIR} The whole thing" @echo "--------------------------------------------------------------" @echo - ${MAKE} install + cd ${.CURDIR} && ${MAKE} install cd ${.CURDIR}/share/man && ${MAKE} makedb hierarchy: @@ -166,25 +166,8 @@ cleandist: @echo "--------------------------------------------------------------" @echo " Cleaning up the source tree, and rebuilding the obj tree" @echo "--------------------------------------------------------------" - @echo - here=`pwd`; dest=/usr/obj`echo $$here | sed 's,^/usr/src,,'`; \ - if test -d /usr/obj -a ! -d $$dest; then \ - mkdir -p $$dest; \ - else \ - true; \ - fi; \ - cd $$dest && rm -rf ${SUBDIR} - find . -name obj | xargs rm -rf -.if defined(MAKE_LOCAL) & exists(local) & exists(local/Makefile) - # The cd is done as local may well be a symbolic link - -cd local && find . -name obj | xargs rm -rf -.endif -.if defined(MAKE_PORTS) & exists(ports) & exists(ports/Makefile) - # The cd is done as local may well be a symbolic link - -cd ports && find . -name obj | xargs rm -rf -.endif - ${MAKE} cleandir - ${MAKE} obj + cd ${.CURDIR} && ${MAKE} cleandir + cd ${.CURDIR} && ${MAKE} obj .endif installmost: @@ -229,7 +212,7 @@ mk: @echo "--------------------------------------------------------------" @echo " Rebuilding ${DESTDIR}/usr/share/mk" @echo "--------------------------------------------------------------" - cd ${.CURDIR}/share/mk && ${MAKE} install + cd ${.CURDIR}/share/mk && ${MAKE} install includes: @echo "--------------------------------------------------------------" |