[Midnightbsd-cvs] src [7540] trunk/usr.bin/bmake: update configuration

[laffer1 at midnightbsd.org]

Revision: 7540
          http://svnweb.midnightbsd.org/src/?rev=7540
Author:   laffer1
Date:     2016-04-14 21:40:54 -0400 (Thu, 14 Apr 2016)
Log Message:
-----------
update configuration

Modified Paths:
--------------
    trunk/usr.bin/bmake/Makefile
    trunk/usr.bin/bmake/Makefile.config
    trunk/usr.bin/bmake/Makefile.inc
    trunk/usr.bin/bmake/config.h

Modified: trunk/usr.bin/bmake/Makefile
===================================================================
--- trunk/usr.bin/bmake/Makefile	2016-04-15 01:38:49 UTC (rev 7539)
+++ trunk/usr.bin/bmake/Makefile	2016-04-15 01:40:54 UTC (rev 7540)
@@ -17,7 +17,7 @@
 #	$Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20130904
+MAKE_VERSION= 20140620
 
 PROG?=	${.CURDIR:T}
 
@@ -84,7 +84,7 @@
 prefix?= /usr
 srcdir?= ${.CURDIR}
 
-DEFAULT_SYS_PATH?= .../share/mk:${prefix}/share/mk
+DEFAULT_SYS_PATH?= ${prefix}/share/mk
 
 CPPFLAGS+= -DUSE_META
 CFLAGS+= ${CPPFLAGS}

Modified: trunk/usr.bin/bmake/Makefile.config
===================================================================
--- trunk/usr.bin/bmake/Makefile.config	2016-04-15 01:38:49 UTC (rev 7539)
+++ trunk/usr.bin/bmake/Makefile.config	2016-04-15 01:40:54 UTC (rev 7540)
@@ -19,3 +19,7 @@
 LDADD= 
 USE_META= yes
 FILEMON_H= /usr/include/dev/filemon/filemon.h
+BMAKE_PATH_MAX?= 1024
+# used if MAXPATHLEN not defined
+CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
+

Modified: trunk/usr.bin/bmake/Makefile.inc
===================================================================
--- trunk/usr.bin/bmake/Makefile.inc	2016-04-15 01:38:49 UTC (rev 7539)
+++ trunk/usr.bin/bmake/Makefile.inc	2016-04-15 01:40:54 UTC (rev 7540)
@@ -1,4 +1,4 @@
-# $FreeBSD: stable/10/usr.bin/bmake/Makefile.inc 250755 2013-05-17 22:18:27Z sjg $ 
+# $FreeBSD: stable/10/usr.bin/bmake/Makefile.inc 288403 2015-09-29 22:00:03Z bdrewery $ 
 
 .include "bsd.own.mk"
 
@@ -13,7 +13,7 @@
 MK_BMAKE= yes
 .endif
 
-.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
+.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" && exists(${.CURDIR}/tests)
 PROG= make
 .endif
 
@@ -21,5 +21,12 @@
 NO_SHARED?=     YES
 .endif
 
+# hack to not add tests to tests subdir since this is included from
+# there and to avoid renaming things that require changes to generated
+# files.
+.if defined(MK_TESTS) && ${MK_TESTS} != no && exists(${.CURDIR}/tests)
+SUBDIR+= tests
+.endif
+
 WARNS=3
 CFLAGS+= -DNO_PWD_OVERRIDE

Modified: trunk/usr.bin/bmake/config.h
===================================================================
--- trunk/usr.bin/bmake/config.h	2016-04-15 01:38:49 UTC (rev 7539)
+++ trunk/usr.bin/bmake/config.h	2016-04-15 01:40:54 UTC (rev 7540)
@@ -1,3 +1,4 @@
+/* $FreeBSD: stable/10/usr.bin/bmake/config.h 276305 2014-12-27 16:43:22Z ngie $ */
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */