From 62d1b85d68a437e8743abbc91483606188680b53 Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 4 Mar 2008 22:32:58 +0000 Subject: 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. --- usr.bin/make/Makefile | 5 ----- usr.bin/make/job.c | 6 ------ 2 files changed, 11 deletions(-) (limited to 'usr.bin') 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 __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); -- cgit v1.1