From owner-p4-projects@FreeBSD.ORG  Sun May  8 04:43:39 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 20C7516A4E3; Sun,  8 May 2005 04:43:37 +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 6494A16A4E2
	for <perforce@freebsd.org>; Sun,  8 May 2005 04:43:33 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 44EE443D4C
	for <perforce@freebsd.org>; Sun,  8 May 2005 04:43:33 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j484hX2T025372
	for <perforce@freebsd.org>; Sun, 8 May 2005 04:43:33 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j484hW8o025369
	for perforce@freebsd.org; Sun, 8 May 2005 04:43:32 GMT
	(envelope-from scottl@freebsd.org)
Date: Sun, 8 May 2005 04:43:32 GMT
Message-Id: <200505080443.j484hW8o025369@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76672 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: Sun, 08 May 2005 04:43:39 -0000

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

Change 76672 by scottl@scottl-x64 on 2005/05/08 04:43:20

	Modify the install target to put create the policy.bin symlink
	correctly.

Affected files ...

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

Differences ...

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

@@ -28,11 +28,12 @@
 POLICYVERTMP != ($(CHECKPOLICY) $(POLICYCOMPAT) -V |cut -f 1 -d ' ')
 .endif
 POLICYVER := policy.$(POLICYVERTMP)
+POLICYBIN = policy.bin
 INSTALLDIR = $(DESTDIR)/etc/security/sebsd
 POLICYPATH = $(INSTALLDIR)/policy
 SRCPATH = $(INSTALLDIR)/src
 CONTEXTPATH = $(INSTALLDIR)/contexts
-LOADPATH = $(POLICYPATH)/$(POLICYVER)
+LOADPATH = $(POLICYPATH)/$(POLICYBIN)
 FCPATH = $(CONTEXTPATH)/files/file_contexts
 
 ALL_PROGRAM_MACROS := macros/program/*.te
@@ -101,15 +102,18 @@
 	install -m 644 appconfig/root_default_contexts $@
 
 
-$(LOADPATH):  policy.conf $(CHECKPOLICY)
+$(LOADPATH):  $(POLICYPATH)/$(POLICYVER)
+	ln -s $(POLICYVER) $(LOADPATH)
+
+$(POLICYPATH)/$(POLICYVER): policy.conf $(CHECKPOLICY)
 	mkdir -p $(POLICYPATH)
 	$(CHECKPOLICY) $(POLICYVERCOMPATARGS) -o $@ policy.conf
 # Note: Can't use install, so not sure how to deal with mode, user, and group
 #	other than by default.
 
-policy: policy.bin
+policy: $(POLICYBIN)
 
-policy.bin: $(POLICYVER)
+$(POLICYBIN): $(POLICYVER)
 	ln -s $(POLICYVER) $@
 
 $(POLICYVER):  policy.conf $(CHECKPOLICY)
@@ -168,7 +172,7 @@
 	@-rm $@.tmp $@.root
 
 clean:
-	rm -f policy.bin $(POLICYVER)
+	rm -f $(POLICYBIN) $(POLICYVER)
 	rm -f policy.conf
 	rm -f tmp/*
 	rm -f $(FC)