diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1997-01-13 02:13:19 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1997-01-13 02:13:19 +0000 |
| commit | 79353ba0f73515ac5f1f0671c41a7cf4a805b641 (patch) | |
| tree | 452136647e34ed1780ca0c2edd6964c1f0c80963 /share/mk/bsd.port.subdir.mk | |
| parent | af202156659087d0a60caf70834dcefb46406a0c (diff) | |
| download | src-79353ba0f73515ac5f1f0671c41a7cf4a805b641.tar.gz src-79353ba0f73515ac5f1f0671c41a7cf4a805b641.zip | |
Skip non-existent subdirectories. The diff is rather large because
the original logic went into a section of code assuming some
incarnation is there, but it's basically a "test -d" fix. Closes PR
ports/2082.
Reviewed by: max ("although I didn't test it, it looks fine")
Notes
Notes:
svn path=/head/; revision=21636
Diffstat (limited to 'share/mk/bsd.port.subdir.mk')
| -rw-r--r-- | share/mk/bsd.port.subdir.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk index 88187fde8ac3..f939dce8bf6b 100644 --- a/share/mk/bsd.port.subdir.mk +++ b/share/mk/bsd.port.subdir.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $Id: bsd.port.subdir.mk,v 1.14 1996/04/09 22:54:13 wosch Exp $ +# $Id: bsd.port.subdir.mk,v 1.15 1996/11/01 07:22:37 asami Exp $ .MAIN: all @@ -22,16 +22,17 @@ _SUBDIRUSE: .USE ${ECHO_MSG} "===> ${DIRPRFX}$${entry} skipped"; \ fi; \ done; \ + if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \ + edir=$${entry}.${MACHINE}; \ + elif test -d ${.CURDIR}/$${entry}; then \ + edir=$${entry}; \ + else \ + OK="false"; \ + ${ECHO_MSG} "===> ${DIRPRFX}$${entry} non-existent"; \ + fi; \ if [ "$$OK" = "" ]; then \ - if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \ - ${ECHO_MSG} "===> ${DIRPRFX}$${entry}.${MACHINE}"; \ - edir=$${entry}.${MACHINE}; \ - cd ${.CURDIR}/$${edir}; \ - else \ - ${ECHO_MSG} "===> ${DIRPRFX}$$entry"; \ - edir=$${entry}; \ - cd ${.CURDIR}/$${edir}; \ - fi; \ + ${ECHO_MSG} "===> ${DIRPRFX}$${edir}"; \ + cd ${.CURDIR}/$${edir}; \ ${MAKE} ${.TARGET:realinstall=install} \ DIRPRFX=${DIRPRFX}$$edir/; \ fi; \ |