build: *really* install tmpfiles.d/systemd-remote.conf when necessary (#6061)

This fixes commit 5e354b22520bbb02e which was an attempt to avoid installation
of tmpfiles.d/systemd-remote.conf when it was not needed (ie HAVE_REMOTE=false).

Before this fix and with the autotool build, systemd-remote.conf was
distributed and also installed (although it was empty) even though
HAVE_REMOTE=false.

That's what happens when doing last second changes without retesting...

While at it, update tmpfiles.d/.gitignore (var.conf was missing as well
since commit a083537e5d11b).

diff --git a/Makefile.am b/Makefile.am
index 63ffca29180f0cb163c95cd7c81fb21064f27b98..3b9ed874e5d7cf11a5f48f92e786b98277d58e8b 100644 (file)
--- 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 4f0ecaa9c33e64cdb29983050ff97cea5a5f6907..73c62c104576d8f06dec7953d8f1ac2c4f05ae1e 100644 (file)
--- a/tmpfiles.d/.gitignore
+++ b/tmpfiles.d/.gitignore
@@ -1,2 +1,4 @@
 /etc.conf
 /systemd.conf
+/systemd-remote.conf
+/var.conf