diff options
| author | sjg <sjg@FreeBSD.org> | 2014-01-27 17:47:21 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-01-27 17:47:21 +0000 |
| commit | a327d8d25378c580f18d33788bbca7c0586790cb (patch) | |
| tree | 891905810fa98d3e2af074a163a102a34c3641ad /usr.bin/bmake | |
| parent | a9f1fd52d431247c153372d27b2e0baa80b5a147 (diff) | |
| download | FreeBSD-src-a327d8d25378c580f18d33788bbca7c0586790cb.zip FreeBSD-src-a327d8d25378c580f18d33788bbca7c0586790cb.tar.gz | |
Merge bmake-20140101 from vendor
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/bmake/Makefile.config | 4 | ||||
| -rw-r--r-- | usr.bin/bmake/config.h | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index ed3751e..4d8fa38 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $ +# $Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130904 +MAKE_VERSION= 20140101 PROG?= ${.CURDIR:T} @@ -84,7 +84,7 @@ SRCS+= ${LIBOBJS:T:.o=.c} prefix?= /usr srcdir?= ${.CURDIR} -DEFAULT_SYS_PATH?= .../share/mk:${prefix}/share/mk +DEFAULT_SYS_PATH?= ${prefix}/share/mk CPPFLAGS+= -DUSE_META CFLAGS+= ${CPPFLAGS} diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index e4c4d3d..7110870 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -19,3 +19,7 @@ LIBOBJS= ${LIBOBJDIR}stresep$U.o 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} + diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h index 546af84..1edb1d3 100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@ -230,7 +230,7 @@ #define PACKAGE_NAME "bmake" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "bmake 20130706" +#define PACKAGE_STRING "bmake 20140101" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "bmake" @@ -239,7 +239,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20130706" +#define PACKAGE_VERSION "20140101" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void |
