PERFORCE change 76672 for review

[Scott Long]

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

Change 76672 by scottl at 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)
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message