diff options
| author | Franck Bui <fbui@suse.com> | 2017-05-30 17:03:25 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-05-30 19:27:26 +0200 |
| commit | 5e354b22520bbb02e5079672a6f97fe05f185d63 (patch) | |
| tree | 4d735e5cee8c827bce69931e53cae99daa6ed5a5 /Makefile.am | |
| parent | kernel-install: support the case /etc/machine-id is missing or empty (#5975) (diff) | |
| download | systemd-5e354b22520bbb02e5079672a6f97fe05f185d63.tar.xz systemd-5e354b22520bbb02e5079672a6f97fe05f185d63.zip | |
build: only install tmpfiles.d/systemd-remote.conf when necessary (#6051)
Also only include the relevant parts for systemd-journal-remote and
systemd-journal-upload when needed.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 27659188c7..63ffca2918 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2676,6 +2676,7 @@ nodist_systemunit_DATA += \ nodist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ + tmpfiles.d/systemd-remote.conf \ tmpfiles.d/var.conf \ tmpfiles.d/etc.conf @@ -2709,6 +2710,7 @@ endif EXTRA_DIST += \ tmpfiles.d/systemd.conf.m4 \ + tmpfiles.d/systemd-remote.conf.m4 \ tmpfiles.d/etc.conf.m4 \ tmpfiles.d/var.conf.m4 \ units/systemd-tmpfiles-setup-dev.service.in \ @@ -4331,11 +4333,6 @@ systemd_journal_remote_CFLAGS = \ systemd_journal_remote_LDADD += \ $(MICROHTTPD_LIBS) -if ENABLE_TMPFILES -dist_tmpfiles_DATA += \ - tmpfiles.d/systemd-remote.conf -endif - if HAVE_GNUTLS systemd_journal_remote_LDADD += \ $(GNUTLS_LIBS) @@ -4364,6 +4361,13 @@ EXTRA_DIST += \ src/journal-remote/log-generator.py endif +if HAVE_REMOTE +if ENABLE_TMPFILES +dist_tmpfiles_DATA += \ + tmpfiles.d/systemd-remote.conf +endif +endif + # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ $(AM_CFLAGS) |