From owner-svn-src-all@FreeBSD.ORG  Tue Jan  3 17:31:27 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5DDA1065675;
	Tue,  3 Jan 2012 17:31:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A55B08FC17;
	Tue,  3 Jan 2012 17:31:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q03HVRDL034180;
	Tue, 3 Jan 2012 17:31:27 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03HVRkK034178;
	Tue, 3 Jan 2012 17:31:27 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201201031731.q03HVRkK034178@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 3 Jan 2012 17:31:27 +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: r229400 - head/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2012 17:31:27 -0000

Author: jhb
Date: Tue Jan  3 17:31:27 2012
New Revision: 229400
URL: http://svn.freebsd.org/changeset/base/229400

Log:
  Improve the cscope target's handling of MD directories.  Automatically
  include the MACHINE_CPUARCH directory if it differents from MACHINE when
  building an index for a single machine.  Also, include the 'x86' directory
  when building an index for i386, pc98, or amd64.
  
  MFC after:	1 week

Modified:
  head/sys/Makefile

Modified: head/sys/Makefile
==============================================================================
--- head/sys/Makefile	Tue Jan  3 17:19:57 2012	(r229399)
+++ head/sys/Makefile	Tue Jan  3 17:31:27 2012	(r229400)
@@ -13,10 +13,18 @@ CSCOPEDIRS=	boot bsm cam cddl compat con
 		netgraph netinet netinet6 netipsec netipx netnatm netncp \
 		netsmb nfs nfsclient nfsserver nlm opencrypto \
 		pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
+.if !defined(CSCOPE_ARCHDIR)
 .if defined(ALL_ARCH)
-CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86
+CSCOPE_ARCHDIR = amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86
 .else
-CSCOPE_ARCHDIR ?= ${MACHINE}
+CSCOPE_ARCHDIR = ${MACHINE} 
+.if ${MACHINE} != ${MACHINE_CPUARCH}
+CSCOPE_ARCHDIR += ${MACHINE_CPUARCH}
+.endif
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CSCOPE_ARCHDIR += x86
+.endif
+.endif
 .endif
 
 # Loadable kernel modules