svn commit: r246325 - in head/usr.bin/bmake: . unit-tests

[Simon J. Gerraty]

Author: sjg
Date: Mon Feb  4 17:41:17 2013
New Revision: 246325
URL: http://svnweb.freebsd.org/changeset/base/246325

Log:
  Missed adding Makefile.config and unit-tests/Makefile should
  allow FreeBSD make to do 'obj'.
  
  Approved by:	marcel (mentor)

Added:
  head/usr.bin/bmake/Makefile.config   (contents, props changed)
Modified:
  head/usr.bin/bmake/unit-tests/Makefile

Added: head/usr.bin/bmake/Makefile.config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/bmake/Makefile.config	Mon Feb  4 17:41:17 2013	(r246325)
@@ -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

Modified: head/usr.bin/bmake/unit-tests/Makefile
==============================================================================
--- head/usr.bin/bmake/unit-tests/Makefile	Mon Feb  4 17:29:13 2013	(r246324)
+++ head/usr.bin/bmake/unit-tests/Makefile	Mon Feb  4 17:41:17 2013	(r246325)
@@ -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'