svn commit: r283689 - projects/bmake/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Fri May 29 06:45:32 2015
New Revision: 283689
URL: https://svnweb.freebsd.org/changeset/base/283689

Log:
  Allow AUTO_OBJ with out META_MODE.
  Remove frobbing of SRCCONF etc - not strictly relevant to meta mode.

Modified:
  projects/bmake/share/mk/local.sys.mk

Modified: projects/bmake/share/mk/local.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.sys.mk	Fri May 29 06:44:09 2015	(r283688)
+++ projects/bmake/share/mk/local.sys.mk	Fri May 29 06:45:32 2015	(r283689)
@@ -7,7 +7,7 @@ _TARGETS:= ${.TARGETS}
 .endif
 
 .if (!empty(_TARGETS) && ${_TARGETS:Nbuildworld:Nuniverse:Ninstallworld} == "") || defined(WITHOUT_META_MODE)
-MK_AUTO_OBJ= no
+MK_AUTO_OBJ?= no
 MK_META_MODE= no
 MK_STAGING= no
 MK_STAGING_PROG= no
@@ -15,11 +15,6 @@ MK_SYSROOT= no
 UPDATE_DEPENDFILE=NO
 .endif
 
-SRCCONF:= ${.PARSEDIR}/src.conf
-# ensure we are self contained
-__MAKE_CONF:= ${SRCCONF}
-.-include "src.conf"
-
 # some handy macros
 _this = ${.PARSEDIR:tA}/${.PARSEFILE}
 # some useful modifiers