summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-06-09 14:31:12 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-09 14:31:12 +0200
commit4f7cd56ef270ec2614f2efc916551b5e3c5acc50 (patch)
tree57a562d2da6bc9b0e5bedfd2c435ca41d27be9a4
parentMerge pull request #111 from phomes/cleanup_warning_suppression (diff)
parentbuild-sys: always dist *.policy.in files (diff)
downloadsystemd-4f7cd56ef270ec2614f2efc916551b5e3c5acc50.tar.xz
systemd-4f7cd56ef270ec2614f2efc916551b5e3c5acc50.zip
Merge pull request #121 from martinpitt/master
build-sys: always dist *.policy.in files
-rw-r--r--Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 7603b2c0e1..5d30d7d51c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5176,9 +5176,6 @@ dist_dbuspolicy_DATA += \
polkitpolicy_files += \
src/machine/org.freedesktop.machine1.policy
-polkitpolicy_in_files += \
- src/machine/org.freedesktop.machine1.policy.in
-
dist_zshcompletion_DATA += \
shell-completion/zsh/_machinectl \
shell-completion/zsh/_sd_machines
@@ -5211,6 +5208,9 @@ lib_LTLIBRARIES += \
endif
+polkitpolicy_in_files += \
+ src/machine/org.freedesktop.machine1.policy.in
+
EXTRA_DIST += \
units/systemd-machined.service.in
@@ -5359,9 +5359,6 @@ dist_dbuspolicy_DATA += \
polkitpolicy_files += \
src/import/org.freedesktop.import1.policy
-polkitpolicy_in_files += \
- src/import/org.freedesktop.import1.policy.in
-
manual_tests += \
test-qcow2
@@ -5387,6 +5384,9 @@ endif
endif
+polkitpolicy_in_files += \
+ src/import/org.freedesktop.import1.policy.in
+
EXTRA_DIST += \
units/systemd-importd.service.in \
src/resolve/resolved.conf.in