diff options
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | tmpfiles.d/.gitignore | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 63ffca2918..3b9ed874e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2676,7 +2676,6 @@ nodist_systemunit_DATA += \ nodist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ - tmpfiles.d/systemd-remote.conf \ tmpfiles.d/var.conf \ tmpfiles.d/etc.conf @@ -2693,6 +2692,11 @@ dist_tmpfiles_DATA += \ tmpfiles.d/legacy.conf endif +if HAVE_REMOTE +nodist_tmpfiles_DATA += \ + tmpfiles.d/systemd-remote.conf +endif + SYSINIT_TARGET_WANTS += \ systemd-tmpfiles-setup-dev.service \ systemd-tmpfiles-setup.service @@ -4361,13 +4365,6 @@ 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) diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore index 4f0ecaa9c3..73c62c1045 100644 --- a/tmpfiles.d/.gitignore +++ b/tmpfiles.d/.gitignore @@ -1,2 +1,4 @@ /etc.conf /systemd.conf +/systemd-remote.conf +/var.conf |