summaryrefslogtreecommitdiffstats
path: root/usr.bin/bmake
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-04-12 20:48:55 +0000
committersjg <sjg@FreeBSD.org>2013-04-12 20:48:55 +0000
commit97d8b9495668afa398ab17c8c5f7e223b5fd2e89 (patch)
tree54038c9ac32a45f8741dcc23fb9a8ffc0e15ff89 /usr.bin/bmake
parent5ee3bfdb338e7c80af29a67f4425c4be24c7b866 (diff)
parent086d73aef6d0ab7d21daa2076fdc8d25961f9b05 (diff)
downloadFreeBSD-src-97d8b9495668afa398ab17c8c5f7e223b5fd2e89.zip
FreeBSD-src-97d8b9495668afa398ab17c8c5f7e223b5fd2e89.tar.gz
sync from head
Diffstat (limited to 'usr.bin/bmake')
-rw-r--r--usr.bin/bmake/Makefile4
-rw-r--r--usr.bin/bmake/config.h4
-rw-r--r--usr.bin/bmake/unit-tests/Makefile5
3 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 6cac1ec..07c6e56 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.5 2013/01/28 19:31:58 sjg Exp $
+# $Id: Makefile,v 1.10 2013/03/31 05:57:19 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130123
+MAKE_VERSION= 20130330
PROG?= ${.CURDIR:T}
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 32026c7..93191b5 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 20121212"
+#define PACKAGE_STRING "bmake 20130303"
/* 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 "20121212"
+#define PACKAGE_VERSION "20130303"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile
index 0b9db1e..b24871f 100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@ -5,9 +5,9 @@
SRCTOP?= ${.CURDIR:H:H:H}
-# $Id: Makefile.in,v 1.40 2012/12/28 21:28:19 sjg Exp $
+# $Id: Makefile.in,v 1.42 2013/03/23 02:31:13 sjg Exp $
#
-# $NetBSD: Makefile,v 1.35 2012/11/09 19:08:28 sjg Exp $
+# $NetBSD: Makefile,v 1.36 2013/03/22 16:36:46 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -35,6 +35,7 @@ SUBFILES= \
error \
export \
export-all \
+ export-env \
doterror \
dotwait \
forloop \
OpenPOWER on IntegriCloud