From a5422567f996e7316e1e9471b8b993f146212fcd Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 18 May 2018 19:49:54 +0000
Subject: Import bmake-20180512

Of relevance:

  o job.c: skip polling job token pipe
  o parse.c: be more cautious about detecting depenency line
    rather than sysV style include.

also in mk:

* dirdeps.mk: include local.dirdeps-build.mk when .MAKE.LEVEL > 0
  ie. we are building something.
* FILES: add dirdeps-options.mk to deal with optional DIRDEPS.
* ldorder.mk: describe how to use LDORDER_EXTERN_BARRIER
  if needed.
---
 mk/install-mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk/install-mk')

diff --git a/mk/install-mk b/mk/install-mk
index 4b9ed253fd8a..70233fc23ed8 100644
--- a/mk/install-mk
+++ b/mk/install-mk
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.153 2018/01/24 22:57:11 sjg Exp $
+#	$Id: install-mk,v 1.156 2018/04/22 04:42:47 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg@crufty.net
 #
 
-MK_VERSION=20180118
+MK_VERSION=20180420
 OWNER=
 GROUP=
 MODE=444
-- 
cgit v1.3