From owner-p4-projects@FreeBSD.ORG  Thu Mar  9 18:40:10 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B72DD16A423; Thu,  9 Mar 2006 18:40:09 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 901EC16A420
	for <perforce@freebsd.org>; Thu,  9 Mar 2006 18:40:09 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5AB9643D46
	for <perforce@freebsd.org>; Thu,  9 Mar 2006 18:40:09 +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.13.1/8.13.1) with ESMTP id k29Ie9Bv017284
	for <perforce@freebsd.org>; Thu, 9 Mar 2006 18:40:09 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29Ie8QS017281
	for perforce@freebsd.org; Thu, 9 Mar 2006 18:40:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 9 Mar 2006 18:40:08 GMT
Message-Id: <200603091840.k29Ie8QS017281@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>
Cc: 
Subject: PERFORCE change 93060 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 09 Mar 2006 18:40:10 -0000

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

Change 93060 by rwatson@rwatson_peppercorn on 2006/03/09 18:39:50

	SEBSD is not properly connected to the build tools section of the
	build, so interacts poorly with mergemaster.  For now, use the
	installed system sebsd_* tools, rather than trying to run from
	DESTDIR where they may not exist.  In the future, we'll need to
	attach the SEBSD tool set to the build tool set so it can run in
	the build/install environment.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#23 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#23 (text+ko) ====

@@ -18,9 +18,9 @@
 
 FLASKDIR = flask/
 PREFIX = /usr
-LOADPOLICY  = $(DESTDIR)/usr/sbin/sebsd_loadpolicy
-CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy
-SETFILES = $(DESTDIR)/sbin/sebsd_setfiles
+LOADPOLICY  = /usr/sbin/sebsd_loadpolicy
+CHECKPOLICY = /sbin/sebsd_checkpolicy
+SETFILES = /sbin/sebsd_setfiles
 .if (POLICYVERCOMPAT)
 POLICYVERTMP = $(POLICYVERCOMPAT)
 POLICYVERCOMPATARGS = -c $(POLICYVERCOMPAT)