chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxy: cloning smack label
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d4d96e134f4ad9881363c293cc4f3e4302bcb8c6..78cf4a94f0880603b8b1be07b4953dc15809d53c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-591,7
+591,7
@@
EXTRA_DIST += \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/systemd-machine-id-commit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/systemd-machine-id-commit.service.in \
- units/user@.service.in \
+ units/user@.service.
m4.
in \
units/debug-shell.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
units/debug-shell.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
@@
-2579,9
+2579,16
@@
dist_userunit_DATA += \
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
- units/systemd-bus-proxyd@.service.in \
+ units/systemd-bus-proxyd@.service.
m4.
in \
units/user/systemd-bus-proxyd@.service.in
units/user/systemd-bus-proxyd@.service.in
+if HAVE_SMACK
+bus-proxyd-set-cap-hook:
+ $(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
+
+INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
+endif
+
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
@@
-4478,14
+4485,18
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
-dist_udevrules_DATA += \
+
no
dist_udevrules_DATA += \
src/vconsole/90-vconsole.rules
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
src/vconsole/90-vconsole.rules
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
+
+CLEANFILES += \
+ src/vconsole/90-vconsole.rules
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
+ src/vconsole/90-vconsole.rules.in \
units/systemd-vconsole-setup.service.in
# ------------------------------------------------------------------------------
units/systemd-vconsole-setup.service.in
# ------------------------------------------------------------------------------
@@
-4507,6
+4518,15
@@
rootlibexec_PROGRAMS += \
dist_pkgsysconf_DATA += \
src/bootchart/bootchart.conf
dist_pkgsysconf_DATA += \
src/bootchart/bootchart.conf
+
+nodist_systemunit_DATA += \
+ units/systemd-bootchart.service
+
+EXTRA_DIST += \
+ units/systemd-bootchart.service.in
+
+CLEANFILES += \
+ units/systemd-bootchart.service
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------