diff options
| author | obrien <obrien@FreeBSD.org> | 2008-03-04 22:32:58 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2008-03-04 22:32:58 +0000 |
| commit | 62d1b85d68a437e8743abbc91483606188680b53 (patch) | |
| tree | 85d39ef224ce130b4910a9267674123264ca5900 /usr.bin | |
| parent | a87beb694c9a3c17635679903426242471277711 (diff) | |
| download | FreeBSD-src-62d1b85d68a437e8743abbc91483606188680b53.zip FreeBSD-src-62d1b85d68a437e8743abbc91483606188680b53.tar.gz | |
No need to tell make to DTRT with "make love", just do it.
Also remove the 2002/08/31 bootstrapping aid for upgrades from
year old (mid-2001) systems.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/make/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/make/job.c | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index c054ae0..e5be06d 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -12,12 +12,7 @@ NO_WERROR= WARNS?= 6 NO_SHARED?= YES -CFLAGS+=-DOLD_JOKE=1 CFLAGS+=-DMAKE_VERSION=\"5200408120\" -.if defined(_UPGRADING) -CFLAGS+=-D__FBSDID=__RCSID -.endif - # There is no obvious performance improvement currently. # CFLAGS+=-DUSE_KQUEUE diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 6136c6f..c871eb5 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -42,10 +42,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#ifndef OLD_JOKE -#define OLD_JOKE 0 -#endif /* OLD_JOKE */ - /*- * job.c -- * handle the creation etc. of our child processes. @@ -1271,11 +1267,9 @@ Job_CheckCommands(GNode *gn, void (*abortProc)(const char *, ...)) fflush(stdout); return (FALSE); } else { -#if OLD_JOKE if (strcmp(gn->name,"love") == 0) (*abortProc)("Not war."); else -#endif (*abortProc)("%s %s. Stop", msg, gn->name); return (FALSE); |
