d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Untangle some special magic that happened for conflicting defintions for

Browse Source 
local files.* and options.* files on the third pass.
This commit is contained in:
peter 2001-02-28 02:07:47 +00:00
parent 15ab0e574b
commit f6762efb3f
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/config/mkmakefile.c
View File

@ -316,14 +316,6 @@ read_files(void)
"files.%s", machinename);
goto openit;
}
if (first == 2) {
first++;
(void) snprintf(fname, sizeof(fname),
"files.%s", raisestr(ident));
fp = fopen(fname, "r");
if (fp != 0)
goto next;
}
return;
}
if (wd == 0)
@ -346,15 +338,6 @@ read_files(void)
else
isdup = 0;
tp = 0;
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;

7
usr.sbin/config/mkoptions.c
View File

@ -319,13 +319,6 @@ read_options(void)
(void) snprintf(fname, sizeof fname, "options.%s", machinename);
goto openit;
}
if (first == 2) {
first++;
(void) snprintf(fname, sizeof fname, "options.%s", raisestr(ident));
fp = fopen(fname, "r");
if (fp != 0)
goto next;
}
return;
}
if (wd == 0)