summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-12-10 12:05:26 +0100
committerLennart Poettering <lennart@poettering.net>2015-12-10 12:05:26 +0100
commit312501458d119704e27e14ef59a18f612757421c (patch)
tree586617151359b8ef2ac26dff440111b8882624f3 /Makefile.am
parentada64a0cff58497147bd856688901f86f86ae1c0 (diff)
parente400d4b3f57e4303e5ff46f18d94b7c0f7ed589e (diff)
Merge pull request #2086 from evverx/fix-journal-upload-installation
build: fix systemd-journal-upload installation
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index e99c937e61..f20e555d5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2413,6 +2413,11 @@ nodist_sysusers_DATA = \
sysusers.d/systemd.conf \
sysusers.d/basic.conf
+if HAVE_REMOTE
+nodist_sysusers_DATA += \
+ sysusers.d/systemd-remote.conf
+endif
+
INSTALL_DIRS += \
$(sysusersdir)
endif
@@ -2420,6 +2425,7 @@ endif
EXTRA_DIST += \
units/systemd-sysusers.service.in \
sysusers.d/systemd.conf.m4 \
+ sysusers.d/systemd-remote.conf.m4 \
sysusers.d/basic.conf.in
# ------------------------------------------------------------------------------
@@ -3924,11 +3930,6 @@ systemd_journal_remote_CFLAGS = \
systemd_journal_remote_LDADD += \
$(MICROHTTPD_LIBS)
-if ENABLE_SYSUSERS
-dist_sysusers_DATA += \
- sysusers.d/systemd-remote.conf
-endif
-
if ENABLE_TMPFILES
dist_tmpfiles_DATA += \
tmpfiles.d/systemd-remote.conf