diff options
| author | archie <archie@FreeBSD.org> | 1999-12-02 23:43:08 +0000 |
|---|---|---|
| committer | archie <archie@FreeBSD.org> | 1999-12-02 23:43:08 +0000 |
| commit | 742df5cd6f5f127bb65071b0bb7401859420cbe4 (patch) | |
| tree | 43785050a8281af84c4151fbb9e8867c36ff40b4 /usr.sbin/config | |
| parent | a5ed2dfc01145d4c5fa0dfe9a5e3e3b45964b454 (diff) | |
| download | FreeBSD-src-742df5cd6f5f127bb65071b0bb7401859420cbe4.zip FreeBSD-src-742df5cd6f5f127bb65071b0bb7401859420cbe4.tar.gz | |
When specifying additiona user-specified kernel compilation source
files in a 'files.XXX' file, config allows non-FreeBSD source files
with the same name as a FreeBSD source file to override the latter,
and in this situation it issues a warning.
However, if one of the user-specified files is actually a FreeBSD
source file (perhaps your kernel has some custom option that requires
that file), config mistakenly thinks it's a completely new file
and goes ahead and overrides all previous information for that file
(and issues the warning).
Fix this.
With help from: julian
Diffstat (limited to 'usr.sbin/config')
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 96f8610..a7df7ab 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -309,7 +309,7 @@ next: else isdup = 0; tp = 0; - if (first == 3 && (tp = fltail_lookup(this)) != 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); nreqs = 0; |
