From owner-svn-src-head@FreeBSD.ORG  Sun May 11 23:22:32 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EBD7BC2D;
 Sun, 11 May 2014 23:22:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D99A32F82;
 Sun, 11 May 2014 23:22:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BNMWjx056368;
 Sun, 11 May 2014 23:22:32 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BNMWbP056367;
 Sun, 11 May 2014 23:22:32 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405112322.s4BNMWbP056367@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 11 May 2014 23:22:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265898 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 May 2014 23:22:33 -0000

Author: imp
Date: Sun May 11 23:22:32 2014
New Revision: 265898
URL: http://svnweb.freebsd.org/changeset/base/265898

Log:
  Attempt to walk a fine line between current usage (/usr/ports which
  does an out-of-tree build without setting MAKESYSPATH) and recently
  added requirements (JIRA's building the modules in a non-standard
  layout). So, when MAKESYSPATH is defined, trust that it will do the
  right thing (to catch the JIRA use case). When it isn't defined,
  assume a standard FreeBSD tree and reach over to grab bsd.mkopt.mk (to
  fix the /usr/ports use case). Both camps cannot be appeased otherwise,
  so we have this kludge until it can be sorted out.

Modified:
  head/sys/conf/kern.opts.mk

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Sun May 11 22:06:06 2014	(r265897)
+++ head/sys/conf/kern.opts.mk	Sun May 11 23:22:32 2014	(r265898)
@@ -21,4 +21,15 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
 
+# Kludge to allow a less painful transition. If MAKESYSPATH isn't defined,
+# assume we have a standard FreeBSD src tree layout and reach over and grab
+# bsd.mkopt.mk from there. If it is defined, trust it to point someplace sane
+# and include bsd.mkopt.mk from there. We need the !defined case to keep ports
+# kernel modules working (though arguably they should define MAKESYSPATH). We
+# need the latter case to keep the JIRA case working where they specifically
+# use a non-standard layout, but do define MAKESYSPATH correctly.
+.if !defined(MAKESYSPATH)
 .include "../../share/mk/bsd.mkopt.mk"
+.else
+.include <bsd.mkopt.mk>
+.endif