PERFORCE change 63579 for review

[Robert Watson]

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

Change 63579 by rwatson at 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