summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--usr.bin/make/Makefile3
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d4940bb..e99c0f0 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 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}
OpenPOWER on IntegriCloud