From owner-p4-projects@FreeBSD.ORG  Mon May  3 10:40:31 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AAB8616A4D0; Mon,  3 May 2004 10:40:31 -0700 (PDT)
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 82D4B16A4CE
	for <perforce@freebsd.org>; Mon,  3 May 2004 10:40:31 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4AB8A43D49
	for <perforce@freebsd.org>; Mon,  3 May 2004 10:40:31 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43HeUGe078337
	for <perforce@freebsd.org>; Mon, 3 May 2004 10:40:30 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43HeU2n078333
	for perforce@freebsd.org; Mon, 3 May 2004 10:40:30 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 10:40:30 -0700 (PDT)
Message-Id: <200405031740.i43HeU2n078333@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52150 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: Mon, 03 May 2004 17:40:32 -0000

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

Change 52150 by cvance@cvance_g5 on 2004/05/03 10:39:59

	Refine build just a bit more.  
	Rename export to "release"
	Really hook the policy build back into the makefiles.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin73/Makeconfig#3 edit
.. //depot/projects/trustedbsd/sedarwin73/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/export/Makefile#3 delete
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#1 add

Differences ...

==== //depot/projects/trustedbsd/sedarwin73/Makeconfig#3 (text+ko) ====

@@ -4,7 +4,7 @@
 # Set the following variable to the installation directory
 # or leave blank for "/"
 #DESTDIR =
-DESTDIR = $(SEDARWIN_ROOT)/export/root
+DESTDIR = $(SEDARWIN_ROOT)/export
 
 # if you aren't going to install as root, you need to set the
 # user for 

==== //depot/projects/trustedbsd/sedarwin73/Makefile#3 (text+ko) ====

@@ -1,7 +1,7 @@
 include Makeconfig
 
-SUBDIR= apsl \
-	export \
+SUBDIR= release \
+	apsl \
 	libextattr \
 	libmac \
 	libsebsd \
@@ -17,6 +17,6 @@
 #	sebsd_system
 
 distclean:
-	cd export && $(MAKE) distclean
+	cd release && $(MAKE) distclean
 
 .include <bsd.subdir.mk>

==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#3 (text+ko) ====

@@ -12,7 +12,7 @@
 	cat $(INPUTS) > policy.conf
 
 $(POLICY): policy.conf
-	$(DESTDIR)/$(BINDIR)/checkpolicy -o $(POLICY) policy.conf
+	../sebsd_cmds/checkpolicy/checkpolicy -o $(POLICY) policy.conf
 
 rules.m4: rules
 	m4 -Imacros -s rules > rules.m4
@@ -28,7 +28,7 @@
 	    genfs
 
 relabel: fc
-	$(DESTDIR)/$(BINDIR)/setfsmac -s fc /
+	@echo This is broken
 
 install:
 	$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}