summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2013-02-04 17:41:17 +0000
committersjg <sjg@FreeBSD.org>2013-02-04 17:41:17 +0000
commit2a731cd0dd5f3265dcf3093fbbe4200aae9e90dd (patch)
tree5f92685e4fb8633c31c268535e2a3b872039d512 /usr.bin
parent686165fb5fd13537a3eb146b18188cce8121bcd2 (diff)
downloadFreeBSD-src-2a731cd0dd5f3265dcf3093fbbe4200aae9e90dd.zip
FreeBSD-src-2a731cd0dd5f3265dcf3093fbbe4200aae9e90dd.tar.gz
Missed adding Makefile.config and unit-tests/Makefile should
allow FreeBSD make to do 'obj'. Approved by: marcel (mentor)
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/bmake/Makefile.config21
-rw-r--r--usr.bin/bmake/unit-tests/Makefile2
2 files changed, 23 insertions, 0 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config
new file mode 100644
index 0000000..e4c4d3d
--- /dev/null
+++ b/usr.bin/bmake/Makefile.config
@@ -0,0 +1,21 @@
+# This is a generated file, do NOT edit!
+# See contrib/bmake/bsd.after-import.mk
+#
+# $FreeBSD$
+
+SRCTOP?= ${.CURDIR:H:H}
+
+# things set by configure
+
+prefix= /usr
+srcdir= ${SRCTOP}/contrib/bmake
+CC?= gcc
+DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk
+
+CPPFLAGS+=
+CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H
+LDFLAGS=
+LIBOBJS= ${LIBOBJDIR}stresep$U.o
+LDADD=
+USE_META= yes
+FILEMON_H= /usr/include/dev/filemon/filemon.h
diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile
index 8b2f514..0b9db1e 100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@ -79,10 +79,12 @@ TOOL_TR?= tr
TOOL_DIFF?= diff
DIFF_FLAGS?= -u
+.if defined(.PARSEDIR)
# ensure consistent results from sort(1)
LC_ALL= C
LANG= C
.export LANG LC_ALL
+.endif
# The driver.
# We always pretend .MAKE was called 'make'
OpenPOWER on IntegriCloud