From 25be5768cdeb45e2d1cf952424fad35f70067ef4 Mon Sep 17 00:00:00 2001
From: Julian Elischer <julian@FreeBSD.org>
Date: Fri, 3 Dec 1999 10:06:57 +0000
Subject: [PATCH] MFC: Stop config from getting confused when a standard file
 is required by a site specific option.

---
 usr.sbin/config/mkmakefile.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 0a642a0089ab..56bd43c9a9a0 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -319,9 +319,15 @@ next:
 	else
 		isdup = 0;
 	tp = 0;
-	if (first == 3 && (tp = fltail_lookup(this)) != 0)
-		printf("%s: Local file %s overrides %s.\n",
-		    fname, this, tp->f_fn);
+	if (first == 3 && pf == 0 && (tp = fltail_lookup(this)) != 0) {
+		if (tp->f_type != INVISIBLE || tp->f_flags)
+			printf("%s: Local file %s overrides %s.\n",
+			    fname, this, tp->f_fn);
+		else
+			printf("%s: Local file %s could override %s"
+			    " with a different kernel configuration.\n",
+			    fname, this, tp->f_fn);
+	}
 	nreqs = 0;
 	special = 0;
 	depends = 0;