Module Name: src
Committed By: christos
Date: Sat Dec 19 00:14:43 UTC 2009
Modified Files:
src/share/mk: bsd.subdir.mk
Log Message:
We mustn't search in the path for ${dir}.${MACHINE}; make sure we only
find the ones relative to ${.CURDIR}.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/share/mk/bsd.subdir.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.subdir.mk
diff -u src/share/mk/bsd.subdir.mk:1.50 src/share/mk/bsd.subdir.mk:1.51
--- src/share/mk/bsd.subdir.mk:1.50 Sun Nov 29 11:00:00 2009
+++ src/share/mk/bsd.subdir.mk Fri Dec 18 19:14:43 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.subdir.mk,v 1.50 2009/11/29 16:00:00 uebayasi Exp $
+# $NetBSD: bsd.subdir.mk,v 1.51 2009/12/19 00:14:43 christos Exp $
# @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93
.include <bsd.init.mk>
@@ -6,11 +6,26 @@
.if !defined(NOSUBDIR) # {
.for dir in ${SUBDIR}
+.if "${dir}" == ".WAIT"
+# Don't play with .WAI
+__REALSUBDIR+=${dir}
+.else
+.if "${dir:H}" != ""
+# It is a relative path; make it absolute so exists can't search the path.
+.if exists(${.CURDIR}/${dir}.${MACHINE})
+__REALSUBDIR+=${dir}.${MACHINE}
+.else
+__REALSUBDIR+=${dir}
+.endif
+.else
+# It is an absolute path; leave it alone
.if exists(${dir}.${MACHINE})
__REALSUBDIR+=${dir}.${MACHINE}
.else
__REALSUBDIR+=${dir}
.endif
+.endif
+.endif
.endfor
__recurse: .USE
