diff options
-rw-r--r-- | usr.sbin/config/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/config/config.h | 4 | ||||
-rw-r--r-- | usr.sbin/config/mkmakefile.c | 11 |
3 files changed, 7 insertions, 11 deletions
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 5a8b5ad..07de621 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -8,9 +8,6 @@ MAN8= config.8 DPADD= ${LIBL} LDADD= -ll CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch] -.if defined(CONFIG_NO_CLOBBER_EVER) -CFLAGS+=-DNO_CLOBBER_EVER -.endif .include <bsd.prog.mk> diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 13adf19..d3304e3 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -177,7 +177,7 @@ struct cputype { struct opt { char *op_name; char *op_value; - int op_line; /* line number for error-reporting */ + int op_line; /* line number for error-reporting */ int op_ownfile; /* true = own file, false = makefile */ struct opt *op_next; } *opt, *mkopt; @@ -230,6 +230,6 @@ u_int loadaddress; extern int old_config_present; /* Old config/build directory still there */ -extern char *PREFIX; /* Config file name - for error messages */ +extern char *PREFIX; /* Config file name - for error messages */ #define eq(a,b) (!strcmp(a,b)) diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 011602e..765bddb 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkmakefile.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: mkmakefile.c,v 1.25 1998/02/09 23:59:51 eivind Exp $"; + "$Id: mkmakefile.c,v 1.26 1998/02/18 04:15:04 eivind Exp $"; #endif /* not lint */ /* @@ -262,12 +262,11 @@ makefile() (void) fclose(ofp); moveifchanged(path("Makefile.new"), path("Makefile")); if (warn_make_clean) { - printf("\nUnknown option%s used (not in ../../conf/options " - "or ./options.%s)", (warn_make_clean > 1 ? "s" : ""), - machinename); + printf("\nUnknown option%s used (not in ../../conf/options or ./options.%s)", + (warn_make_clean > 1 ? "s" : ""), + machinename); if (old_config_present) { - printf(" - it is\nVERY important that you do " - "``make clean && make depend'' before recompiling!\n\n"); + printf(" - it is\nVERY important that you do ``make clean && make depend'' before recompiling!\n\n"); } else { printf(".\n\n"); } |