diff options
| author | peter <peter@FreeBSD.org> | 2002-08-31 07:18:40 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-08-31 07:18:40 +0000 |
| commit | e9b69040911ee1febbec3a2f2f93cf920d7d50db (patch) | |
| tree | e5675153d8b00209e5e6c861207a1b842ce8995d | |
| parent | 956a397806c3486e9daeb98d53c368e7688af40b (diff) | |
| download | FreeBSD-src-e9b69040911ee1febbec3a2f2f93cf920d7d50db.zip FreeBSD-src-e9b69040911ee1febbec3a2f2f93cf920d7d50db.tar.gz | |
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.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/make/Makefile | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -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 4f46cae..6208a28 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} |
