MFC bmake-20180222

PR:		226678
Submitted by:	sjg

4 files changed, 15 insertions, 15 deletions

diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 98122f8..f756200 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -14,10 +14,7 @@ CFLAGS+= -I${.CURDIR}
 CLEANDIRS+= FreeBSD
 CLEANFILES+= bootstrap
 
-#	$Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $
-
-# Base version on src date
-_MAKE_VERSION= 20170720
+#	$Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $
 
 PROG?=	${.CURDIR:T}
 
@@ -74,6 +71,7 @@ SRCS+= \
 	lstReplace.c \
 	lstSucc.c
 
+
 # this file gets generated by configure
 .sinclude "Makefile.config"
 
@@ -160,9 +158,6 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man}
 ${OBJS}: config.h
 .endif
 
-# make sure that MAKE_VERSION gets updated.
-main.o: ${SRCS} ${MAKEFILE}
-
 
 # A simple unit-test driver to help catch regressions
 accept test:
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config
index 7110870..77d1cd1 100644
--- a/usr.bin/bmake/Makefile.config
+++ b/usr.bin/bmake/Makefile.config
@@ -7,10 +7,12 @@ SRCTOP?= ${.CURDIR:H:H}
 
 # things set by configure
 
-prefix= /usr
+_MAKE_VERSION=20180222
+
+prefix?= /usr
 srcdir= ${SRCTOP}/contrib/bmake
-CC?= gcc
-DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk
+CC?= cc
+DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk
 
 CPPFLAGS+= 
 CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H
@@ -18,8 +20,7 @@ LDFLAGS=
 LIBOBJS=  ${LIBOBJDIR}stresep$U.o
 LDADD= 
 USE_META= yes
-FILEMON_H= /usr/include/dev/filemon/filemon.h
+FILEMON_H?= /usr/include/dev/filemon/filemon.h
 BMAKE_PATH_MAX?= 1024
 # used if MAXPATHLEN not defined
 CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
-
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index 918a3ab..3cd2872 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -30,3 +30,7 @@ CFLAGS+= -DNO_PWD_OVERRIDE
 DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk
 .export DEFAULT_SYS_PATH
 .endif
+
+.if ${MACHINE} != "host"
+FILEMON_H ?= ${SRCTOP}/sys/dev/filemon/filemon.h
+.endif
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 7a47d4c..ee55416 100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@ -236,7 +236,7 @@
 #define HAVE_WORKING_VFORK 1
 
 /* define if your compiler has __attribute__ */
-/* #undef HAVE___ATTRIBUTE__ */
+#define HAVE___ATTRIBUTE__ 1
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "sjg@NetBSD.org"
@@ -245,7 +245,7 @@
 #define PACKAGE_NAME "bmake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "bmake 20160606"
+#define PACKAGE_STRING "bmake 20171126"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "bmake"
@@ -254,7 +254,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20160606"
+#define PACKAGE_VERSION "20171126"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void