From 84825790359fd4125092704929cf6985dc644f72 Mon Sep 17 00:00:00 2001 From: archie Date: Fri, 3 Dec 1999 00:28:06 +0000 Subject: A better version of the previous checkin. If the user specifies a custom file that could override a FreeBSD file under a different configuration, but doesn't under this one, give a different warning. --- 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 a7df7ab..8f6f807 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -309,9 +309,15 @@ next: else isdup = 0; tp = 0; - if (first == 3 && fl_lookup(this) == 0 && (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; -- cgit v1.1