aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1997-01-13 02:15:40 +0000
committerSatoshi Asami <asami@FreeBSD.org>1997-01-13 02:15:40 +0000
commit44b40e0b05e5126b70fa5c1225b9f173a4c57e74 (patch)
tree76c2893282fe72715b26ef3ae3bd5024fbf8ad57
parent875fbf29f899b77e022b38ab115b1a6a18cbabfa (diff)
downloadports-44b40e0b05e5126b70fa5c1225b9f173a4c57e74.tar.gz
ports-44b40e0b05e5126b70fa5c1225b9f173a4c57e74.zip
Merge from 1.16: skip non-existent SUBDIRs.
Notes
Notes: svn path=/branches/RELENG_2_2/; revision=5329
-rw-r--r--Mk/bsd.port.subdir.mk21
1 files changed, 11 insertions, 10 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index 88187fde8ac3..f939dce8bf6b 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/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; \