diff options
author | Garrett Wollman <wollman@FreeBSD.org> | 1994-08-04 21:09:27 +0000 |
---|---|---|
committer | Garrett Wollman <wollman@FreeBSD.org> | 1994-08-04 21:09:27 +0000 |
commit | 3585b293d12ea0c224c4edabf57eaee99ec867b9 (patch) | |
tree | b2dfafb898b6f3696ee37301ecd72e960dfe84d3 /share/mk/bsd.subdir.mk | |
parent | 17e8000b6ff59ee357ec2e9b8e19d5e3a79fa696 (diff) | |
download | src-3585b293d12ea0c224c4edabf57eaee99ec867b9.tar.gz src-3585b293d12ea0c224c4edabf57eaee99ec867b9.zip |
Spplat our 1.1.5 `mk' ifiles over the top of the 4.4 ones. So far
as I can tell, this is ts the right thing to do.
Notes
Notes:
svn path=/head/; revision=1844
Diffstat (limited to 'share/mk/bsd.subdir.mk')
-rw-r--r-- | share/mk/bsd.subdir.mk | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 2ca9e8384627..ef4108296fca 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,4 +1,5 @@ -# @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93 +# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 +# $Id: bsd.subdir.mk,v 1.5 1994/01/31 06:10:40 rgrimes Exp $ .MAIN: all @@ -11,13 +12,15 @@ BINMODE?= 555 _SUBDIRUSE: .USE @for entry in ${SUBDIR}; do \ (if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \ - echo "===> $${entry}.${MACHINE}"; \ - cd ${.CURDIR}/$${entry}.${MACHINE}; \ + echo "===> ${DIRPRFX}$${entry}.${MACHINE}"; \ + edir=$${entry}.${MACHINE}; \ + cd ${.CURDIR}/$${edir}; \ else \ - echo "===> $$entry"; \ - cd ${.CURDIR}/$${entry}; \ + echo "===> ${DIRPRFX}$$entry"; \ + edir=$${entry}; \ + cd ${.CURDIR}/$${edir}; \ fi; \ - ${MAKE} ${.TARGET:realinstall=install}); \ + ${MAKE} ${.TARGET:realinstall=install} DIRPRFX=${DIRPRFX}$$edir/); \ done ${SUBDIR}:: @@ -44,8 +47,8 @@ cleandir: _SUBDIRUSE depend: _SUBDIRUSE .endif -.if !target(manpages) -manpages: _SUBDIRUSE +.if !target (maninstall) +maninstall: _SUBDIRUSE .endif .if !target(install) @@ -59,9 +62,6 @@ install: afterinstall afterinstall: realinstall realinstall: beforeinstall _SUBDIRUSE .endif -.if !target(maninstall) -maninstall: _SUBDIRUSE -.endif .if !target(lint) lint: _SUBDIRUSE @@ -71,10 +71,6 @@ lint: _SUBDIRUSE obj: _SUBDIRUSE .endif -.if !target(objdir) -objdir: _SUBDIRUSE -.endif - .if !target(tags) tags: _SUBDIRUSE .endif |