diff options
| author | archie <archie@FreeBSD.org> | 1999-12-03 00:28:06 +0000 |
|---|---|---|
| committer | archie <archie@FreeBSD.org> | 1999-12-03 00:28:06 +0000 |
| commit | 84825790359fd4125092704929cf6985dc644f72 (patch) | |
| tree | 0415aea3ca924ee6211b6505e4a97b9cde75eb6b /usr.sbin/config/mkmakefile.c | |
| parent | aadc1e069589c3ee5caa3c94f16d146f80b1d8c7 (diff) | |
| download | FreeBSD-src-84825790359fd4125092704929cf6985dc644f72.zip FreeBSD-src-84825790359fd4125092704929cf6985dc644f72.tar.gz | |
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.
Diffstat (limited to 'usr.sbin/config/mkmakefile.c')
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 12 |
1 files 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; |
