From owner-p4-projects@FreeBSD.ORG  Sat Oct 23 17:18:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7599116A4D0; Sat, 23 Oct 2004 17:18:30 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4512016A4CE
	for <perforce@freebsd.org>; Sat, 23 Oct 2004 17:18:30 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 36CC143D1F
	for <perforce@freebsd.org>; Sat, 23 Oct 2004 17:18:30 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHIUuM013327
	for <perforce@freebsd.org>; Sat, 23 Oct 2004 17:18:30 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHITQE013324
	for perforce@freebsd.org; Sat, 23 Oct 2004 17:18:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 23 Oct 2004 17:18:29 GMT
Message-Id: <200410231718.i9NHITQE013324@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 63579 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Oct 2004 17:18:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=63579

Change 63579 by rwatson@rwatson_tislabs on 2004/10/23 17:17:55

	Re-arrange some more.  No matter what I do, the build doesn't love
	me because the source asks for "bsm/foo.h" and there is not a
	bsm source directory containing the include files until after an
	install of the include files to DESTDIR.  It looks like we might
	want to ask Apple to rearrange their source tree so that the
	include files are in bsm/ inside the bsm tree rather than libbsm/.

Affected files ...

.. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#2 (text+ko) ====

@@ -2,15 +2,23 @@
 # $FreeBSD$
 #
 
-SRCDIR=${.CURDIR}/../../contrib/bsm/lib
-.PATH: ${SRCDIR}
+BSMDIR=		${.CURDIR}/../../contrib/bsm
 
-LIB=	bsm
+LIB=		bsm
 SHLIB_MAJOR=	1
-SRCS=	bsm_audit.c bsm_class.c bsm_control.c bsm_event.c bsm_flags.c \
-	    bsm_io.c bsm_mask.c bsm_notify.c bsm_token.c bsm_user.c \
-	    lib_wrappers.c
-INCS=	audit_uevents.h libbsm.h
+
+.PATH:		${BSMDIR}/lib
+SRCS=		bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \
+		    bsm_flags.c bsm_io.c bsm_mask.c bsm_notify.c \
+		    bsm_token.c bsm_user.c lib_wrappers.c
+
+#
+# Must use BSM include files from within the contrib area, not the system.
+#
+CFLAGS+=	-I${BSMDIR}
+
+INCS=		audit_uevents.h libbsm.h
+INCSDIR=	${INCLUDEDIR}/bsm
 
 NOMAN=	yes