svn commit: r304494 - releng/11.0

Bryan Drewery bdrewery at FreeBSD.org
Fri Aug 19 19:16:12 UTC 2016


Author: bdrewery
Date: Fri Aug 19 19:16:10 2016
New Revision: 304494
URL: https://svnweb.freebsd.org/changeset/base/304494

Log:
  MFS r304472:
  
    MFC r304006:
  
      Avoid showing the bootstrap make command for check-old, etc.
  
  Approved by:	re (gjb)

Modified:
  releng/11.0/Makefile
  releng/11.0/Makefile.inc1
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/Makefile
==============================================================================
--- releng/11.0/Makefile	Fri Aug 19 19:02:18 2016	(r304493)
+++ releng/11.0/Makefile	Fri Aug 19 19:16:10 2016	(r304494)
@@ -209,7 +209,8 @@ SUB_MAKE= `test -x ${MYMAKE} && echo ${M
 SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
 .endif
 
-_MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
+_MAKE=	PATH=${PATH} MAKE_CMD=${MAKE} ${SUB_MAKE} -f Makefile.inc1 \
+	TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
 
 # Only allow meta mode for the whitelisted targets.  See META_TGT_WHITELIST
 # above.

Modified: releng/11.0/Makefile.inc1
==============================================================================
--- releng/11.0/Makefile.inc1	Fri Aug 19 19:02:18 2016	(r304493)
+++ releng/11.0/Makefile.inc1	Fri Aug 19 19:16:10 2016	(r304494)
@@ -2372,11 +2372,11 @@ check-old-dirs: .PHONY
 	done
 
 delete-old: delete-old-files delete-old-dirs .PHONY
-	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
+	@echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
 
 check-old: check-old-files check-old-libs check-old-dirs .PHONY
-	@echo "To remove old files and directories run '${MAKE} delete-old'."
-	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
+	@echo "To remove old files and directories run '${MAKE_CMD} delete-old'."
+	@echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
 
 .endif
 


More information about the svn-src-all mailing list