opensourcemirror
/
cockpit
mirror of https://github.com/cockpit-project/cockpit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

selinux: remove another mid-body conditional 

Remove another instance of an `if` being inserted in the middle of a
rule body.

Use dist_ instead of EXTRA_DIST and conditionalise the entire file.
This commit is contained in:
Allison Karlitskaya 2022-03-09 11:28:33 +01:00 committed by Martin Pitt
parent 0581a04e3f
commit ebe6488a31
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
selinux/Makefile.am
View File

@ -1,3 +1,5 @@
if SELINUX_POLICY_ENABLED
SELINUX_POLICY_FILES = \
selinux/cockpit.fc \
selinux/cockpit.if \
@ -9,7 +11,7 @@ SELINUX_POLICY_MANPAGES = \
selinux/cockpit_ws_selinux.8cockpit \
$(NULL)
EXTRA_DIST += \
dist_noinst_DATA += \
$(SELINUX_POLICY_FILES) \
$(SELINUX_POLICY_MANPAGES) \
$(NULL)
@ -23,10 +25,11 @@ cockpit.pp.bz2: cockpit.pp
selinuxpackagesdir = $(datadir)/selinux/packages/$(SELINUX_POLICY_TYPE)/
selinuxactivedir = $(sharedstatedir)/selinux/$(SELINUX_POLICY_TYPE)/active/modules/200/cockpit
install-data-hook::
if SELINUX_POLICY_ENABLED
INSTALL_DATA_LOCAL_TARGETS += install-selinux
install-selinux:
$(INSTALL) -d -m 700 $(DESTDIR)$(selinuxactivedir)
selinuxpackages_DATA = cockpit.pp.bz2
man_MANS += $(SELINUX_POLICY_MANPAGES)
endif