From 7b2f27b0fe1959aad1d2a995f15e8022e73544d7 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 31 Aug 2002 07:18:40 +0000 Subject: [PATCH] Deal with bootstrapping from an old -current (almost exactly a year old) which fails the make tests (doesn't understand ${notdef:U}) and therefore fails on __FBSDID in usr.bin/make/*. -DBOOTSTRAPPING is no help here since this is before we are using the new share/mk/* files, and it would conflict with the builtin -DBOOTSTRAPPING support later.. so use a different flag. --- Makefile | 3 ++- usr.bin/make/Makefile | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d4940bbba37c..e99c0f011201 100644 --- a/Makefile +++ b/Makefile @@ -204,7 +204,8 @@ make: @echo " Upgrading the installed make" @echo "--------------------------------------------------------------" @cd ${.CURDIR}/usr.bin/make; \ - make obj && make depend && make all && make install + make obj && make -D_UPGRADING depend && \ + make -D_UPGRADING all && make install # # Define the upgrade targets. These are listed here in alphabetical diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 4f46cae06534..6208a2819daa 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -16,6 +16,9 @@ SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \ NOSHARED?= YES CFLAGS+=-DMAKE_VERSION=\"5200208240\" +.if defined(_UPGRADING) +CFLAGS+=-D__FBSDID=__RCSID +.endif main.o: ${MAKEFILE}