From 01d132e6de4aecfa641945d0e5d774e6c515c8ee Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 8 Mar 2013 01:51:32 +0000
Subject: Control default .MAKE.DEPENDFILE indepentend of
 .MAKE.DEPENDFILE_PREFERENCE

---
 share/mk/local.sys.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'share/mk/local.sys.mk')

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index d10076c..af6e72c 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -168,11 +168,15 @@ STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/include
 .include "meta.sys.mk"
 .endif
 
-# most dirs can be satisfied with one Makefile.depend
-.undef .MAKE.DEPENDFILE
+# this is sufficient for most of the tree.
+.MAKE.DEPENDFILE_DEFAULT = ${.MAKE.DEPENDFILE_PREFIX}
+
+# but if we have a machine qualified file it should be used in preference
 .MAKE.DEPENDFILE_PREFERENCE = \
-	${.MAKE.DEPENDFILE_PREFIX} \
-	${.MAKE.DEPENDFILE_PREFIX}.${MACHINE}
+	${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \
+	${.MAKE.DEPENDFILE_PREFIX}
+
+.undef .MAKE.DEPENDFILE
 
 .include "sys.dependfile.mk"
 
-- 
cgit v1.1