use variable for dtd. move policy type to variant section

This commit is contained in:
Chris PeBenito 2005-06-01 19:01:00 +00:00
parent 004db90d3f
commit 0447352aec
1 changed files with 8 additions and 3 deletions

View File

@ -11,6 +11,7 @@
# restorelabels - check filesystems against the file context configuration # restorelabels - check filesystems against the file context configuration
# and restore the label of files with incorrect labels # and restore the label of files with incorrect labels
# policy - compile the policy configuration locally for testing/development. # policy - compile the policy configuration locally for testing/development.
# xml - create a XML file from in-policy documentation
# #
# The default target is 'policy'. # The default target is 'policy'.
# #
@ -32,6 +33,9 @@ override M4PARAM += -D distro_redhat
# Uncomment this to disable command echoing # Uncomment this to disable command echoing
#QUIET:=@ #QUIET:=@
# Policy type (strict, targeted, etc)
TYPE := strict
######################################## ########################################
# #
# Invariant portions of the Makefile # Invariant portions of the Makefile
@ -44,7 +48,9 @@ SBINDIR := $(PREFIX)/sbin
CHECKPOLICY := $(BINDIR)/checkpolicy CHECKPOLICY := $(BINDIR)/checkpolicy
LOADPOLICY := $(SBINDIR)/load_policy LOADPOLICY := $(SBINDIR)/load_policy
SETFILES := $(SBINDIR)/setfiles SETFILES := $(SBINDIR)/setfiles
XMLLINT := $(BINDIR)/xmllint XMLLINT := $(BINDIR)/xmllint
XMLDTD := policy.dtd
# enable MLS if requested. # enable MLS if requested.
ifeq ($(MLS),y) ifeq ($(MLS),y)
@ -68,7 +74,6 @@ endif
FC := file_contexts FC := file_contexts
POLVER := policy.$(PV) POLVER := policy.$(PV)
TYPE := strict
# install paths # install paths
TOPDIR = $(DESTDIR)/etc/selinux TOPDIR = $(DESTDIR)/etc/selinux
@ -278,8 +283,8 @@ policy.xml: $(ALL_INTERFACES) tmp/generated_definitions.conf
# currently these are only in corenetwork.if # currently these are only in corenetwork.if
$(QUIET) m4 $^ | egrep -h "^##[[:blank:]]" | sed -e 's/^##[[:blank:]]//g' >> $@ $(QUIET) m4 $^ | egrep -h "^##[[:blank:]]" | sed -e 's/^##[[:blank:]]//g' >> $@
$(QUIET) echo "</policy>" >> $@ $(QUIET) echo "</policy>" >> $@
$(QUIET) if test -x $(XMLLINT) && test -f policy.dtd; then \ $(QUIET) if test -x $(XMLLINT) && test -f $(XMLDTD); then \
$(XMLLINT) --noout --dtdvalid policy.dtd $@ ;\ $(XMLLINT) --noout --dtdvalid $(XMLDTD) $@ ;\
fi fi
######################################## ########################################