mirror of
https://github.com/SELinuxProject/refpolicy
synced 2025-02-14 18:47:00 +00:00
fix build.conf inclusion for local policies, add xml build target, nicen eching.
This commit is contained in:
parent
58b2a3c7fc
commit
1a7175a844
@ -25,10 +25,10 @@
|
|||||||
|
|
||||||
# Include the local build.conf if it exists, otherwise
|
# Include the local build.conf if it exists, otherwise
|
||||||
# include the configuration of the root directory.
|
# include the configuration of the root directory.
|
||||||
ifndef LOCAL_ROOT
|
include build.conf
|
||||||
include build.conf
|
|
||||||
else
|
ifdef LOCAL_ROOT
|
||||||
include $(LOCAL_ROOT)/build.conf
|
-include $(LOCAL_ROOT)/build.conf
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# refpolicy version
|
# refpolicy version
|
||||||
@ -335,8 +335,9 @@ $(FCSORT) : $(SUPPORT)/fc_sort.c
|
|||||||
# this and its dependents every time the dependencies
|
# this and its dependents every time the dependencies
|
||||||
# change. Also use all .if files here, rather then just the
|
# change. Also use all .if files here, rather then just the
|
||||||
# enabled modules.
|
# enabled modules.
|
||||||
|
xml: $(POLXML)
|
||||||
$(POLXML): $(DETECTED_MODS:.te=.if) $(foreach dir,$(ALL_LAYERS),$(dir)/$(LAYERXML))
|
$(POLXML): $(DETECTED_MODS:.te=.if) $(foreach dir,$(ALL_LAYERS),$(dir)/$(LAYERXML))
|
||||||
@echo "Creating $@"
|
@echo "Creating $(@F)"
|
||||||
@test -d $(dir $(POLXML)) || mkdir -p $(dir $(POLXML))
|
@test -d $(dir $(POLXML)) || mkdir -p $(dir $(POLXML))
|
||||||
@test -d $(TMPDIR) || mkdir -p $(TMPDIR)
|
@test -d $(TMPDIR) || mkdir -p $(TMPDIR)
|
||||||
$(verbose) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@
|
$(verbose) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@
|
||||||
@ -433,7 +434,7 @@ $(APPDIR)/users/root: $(APPCONF)/root_default_contexts
|
|||||||
#
|
#
|
||||||
install-headers: $(TUNXML) $(BOOLXML)
|
install-headers: $(TUNXML) $(BOOLXML)
|
||||||
@mkdir -p $(HEADERDIR)
|
@mkdir -p $(HEADERDIR)
|
||||||
@echo "Installing policy headers"
|
@echo "Installing $(TYPE) policy headers."
|
||||||
$(verbose) install -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
|
$(verbose) install -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
|
||||||
$(verbose) m4 $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
|
$(verbose) m4 $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
|
||||||
$(verbose) mkdir -p $(HEADERDIR)/support
|
$(verbose) mkdir -p $(HEADERDIR)/support
|
||||||
@ -553,6 +554,6 @@ ifneq ($(GENERATED_FC),)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: install-src install-appconfig generate conf html bare tags
|
.PHONY: install-src install-appconfig generate xml conf html bare tags
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .c
|
.SUFFIXES: .c
|
||||||
|
Loading…
Reference in New Issue
Block a user