From owner-svn-src-head@FreeBSD.ORG  Thu Feb 26 20:54:43 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCEBE1065673;
	Thu, 26 Feb 2009 20:54:43 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB6558FC19;
	Thu, 26 Feb 2009 20:54:43 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1QKshRv038039;
	Thu, 26 Feb 2009 20:54:43 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1QKshPG038038;
	Thu, 26 Feb 2009 20:54:43 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200902262054.n1QKshPG038038@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Thu, 26 Feb 2009 20:54:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189089 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 26 Feb 2009 20:54:44 -0000

Author: thompsa
Date: Thu Feb 26 20:54:43 2009
New Revision: 189089
URL: http://svn.freebsd.org/changeset/base/189089

Log:
  Allow the old usb stack to compile by adding the appropriate -I foo, this must
  go before the standard -I$S to have the search happen before /sys/.
  
  Make this conditional on 'makeoptions WITH_LEGACY=1' in the kernel config.
  
  Prodded by:	sam

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

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Feb 26 20:38:37 2009	(r189088)
+++ head/sys/conf/kern.pre.mk	Thu Feb 26 20:54:43 2009	(r189089)
@@ -53,7 +53,11 @@ C_DIALECT= -std=c99
 NOSTDINC= -nostdinc
 .endif
 
-INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
+.if defined(WITH_LEGACY)
+LEGACY_INC= -I$S/legacy
+.endif
+
+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. ${LEGACY_INC} -I$S
 
 # This hack lets us use the OpenBSD altq code without spamming a new
 # include path into contrib'ed source files.