diff options
| author | bde <bde@FreeBSD.org> | 1999-03-21 06:43:40 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1999-03-21 06:43:40 +0000 |
| commit | 5a225bdc8c7e76ed06e9b50332c284704dacf23b (patch) | |
| tree | 4b942cddbd8315ff5e99a5296b298480beaaecc7 /share/mk | |
| parent | f964808ff384a3fe2549c7c50e6cda3eaa90b652 (diff) | |
| download | FreeBSD-src-5a225bdc8c7e76ed06e9b50332c284704dacf23b.zip FreeBSD-src-5a225bdc8c7e76ed06e9b50332c284704dacf23b.tar.gz | |
Restored objlink. The previous commit was confused about the difference
between OBJLINK and objlink.
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.obj.mk | 12 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index fe31e48..8498434 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,4 +1,4 @@ -# $Id: bsd.obj.mk,v 1.26 1998/08/30 20:33:27 jb Exp $ +# $Id: bsd.obj.mk,v 1.27 1999/03/14 20:41:13 markm Exp $ # # The include file <bsd.obj.mk> handles creating the 'obj' directory # and cleaning up object files, etc. @@ -78,6 +78,16 @@ obj: _SUBDIR .endif .endif +.if !target(objlink) +objlink: _SUBDIR + @if test -d ${CANONICALOBJDIR}/; then \ + rm -f ${.CURDIR}/obj; \ + ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \ + else \ + echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \ + fi +.endif + # # where would that obj directory be? # diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 0fe628b..4cf445c 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $Id: bsd.subdir.mk,v 1.25 1998/08/08 07:02:08 peter Exp $ +# $Id: bsd.subdir.mk,v 1.26 1999/03/14 20:41:14 markm Exp $ # # The include file <bsd.subdir.mk> contains the default targets # for building subdirectories. @@ -33,7 +33,7 @@ # # afterdistribute, afterinstall, all, beforeinstall, checkdpadd, # clean, cleandepend, cleandir, depend, install, lint, maninstall, -# obj, realinstall, regress, tags +# obj, objlink, realinstall, regress, tags # .if !target(__initialized__) @@ -88,7 +88,7 @@ ${SUBDIR}:: .for __target in all checkdpadd clean cleandepend cleandir depend lint \ - maninstall obj regress tags + maninstall obj objlink regress tags .if !target(${__target}) ${__target}: _SUBDIRUSE .endif |
