From owner-p4-projects@FreeBSD.ORG  Fri Feb 16 16:00:35 2007
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 98A3C16A421; Fri, 16 Feb 2007 16:00:35 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 67A0616A408
	for <perforce@freebsd.org>; Fri, 16 Feb 2007 16:00:35 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5486013C46B
	for <perforce@freebsd.org>; Fri, 16 Feb 2007 16:00:35 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GG0Zs6035194
	for <perforce@freebsd.org>; Fri, 16 Feb 2007 16:00:35 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GG0Z9i035191
	for perforce@freebsd.org; Fri, 16 Feb 2007 16:00:35 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 16 Feb 2007 16:00:35 GMT
Message-Id: <200702161600.l1GG0Z9i035191@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114631 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: Fri, 16 Feb 2007 16:00:35 -0000

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

Change 114631 by millert@millert_p4 on 2007/02/16 16:00:28

	Adapt the old policy install path to the new world order.

Affected files ...

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

Differences ...

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

@@ -33,7 +33,7 @@
 .endif
 POLICYVER := policy.$(POLICYVERTMP)
 POLICYBIN = policy.bin
-INSTALLDIR = $(DESTDIR)/etc/security/sebsd/targeted
+INSTALLDIR = $(DESTDIR)/etc/security/sebsd
 POLICYPATH = $(INSTALLDIR)/policy
 SRCPATH = $(INSTALLDIR)/src
 CONTEXTPATH = $(INSTALLDIR)/contexts
@@ -138,10 +138,10 @@
 	m4 $(M4PARAM) -Imacros -s $(POLICYFILES) > $@.tmp
 	mv $@.tmp $@
 
-install-src: $(SRCPATH)
-	rm -rf $(SRCPATH)/policy.old
-	-mv $(SRCPATH)/policy $(SRCPATH)/policy.old
-	cd ..; tar cf - policy | (cd $(SRCPATH); tar xf -)
+install-src: /etc/security/sebsd
+	rm -rf $(INSTALLDIR)/policy.old
+	-mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old
+	cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -)
 
 tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program
 	mkdir -p tmp