10 files changed, 31 insertions, 15 deletions
diff --git a/src/grp-journal/.gitignore b/src/grp-journal/.gitignore
index c3fea7424f..c9bd45a7be 100644
--- a/src/grp-journal/.gitignore
+++ b/src/grp-journal/.gitignore
@@ -1 +1,5 @@
+/journald-gperf.c
+/libsystemd-journal.pc
+/audit_type-list.txt
+/audit_type-*-name.*
 /README
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index 91293d8dfa..764ab80758 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -167,14 +167,13 @@ tests += \
 	test-compress-benchmark
 endif # HAVE_COMPRESSION
 
-ifneq ($(HAVE_SYSV_COMPAT),)
+dist_tmpfiles_DATA = \
+	tmpfiles.d/journal-nocow.conf
 
+ifneq ($(HAVE_SYSV_COMPAT),)
 varlog_DATA = \
 	docs/var-log/README
 
-$(outdir)/README: docs/var-log/README.in
-	$(SED_PROCESS)
-
 CLEANFILES += \
 	docs/var-log/README
 endif # HAVE_SYSV_COMPAT
@@ -182,6 +181,9 @@ endif # HAVE_SYSV_COMPAT
 EXTRA_DIST += \
 	docs/var-log/README.in
 
+dist_systempreset_DATA = \
+	90-journald.preset
+
 nested.subdirs += grp-remote
 nested.subdirs += journalctl
 nested.subdirs += libjournal-core
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
index 2003240fbe..d481db82dc 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
@@ -60,6 +60,9 @@ nodist_systemunit_DATA += \
 dist_gatewayddocumentroot_DATA = \
 	src/journal-remote/browse.html
 
+dist_sysusers_DATA += \
+	sysusers.d/systemd-journal-gatewayd.conf
+
 endif # HAVE_MICROHTTPD
 
 EXTRA_DIST += \
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index b387eae386..45ed4abb63 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -63,15 +63,15 @@ endif # HAVE_GNUTLS
 dist_systemunit_DATA += \
 	units/systemd-journal-remote.socket
 
+dist_sysusers_DATA += \
+	sysusers.d/systemd-journal-remote.conf
+
 nodist_systemunit_DATA += \
 	units/systemd-journal-remote.service
 
-journal-remote-install-hook: journal-install-hook
-	-$(MKDIR_P) $(DESTDIR)/var/log/journal/remote
-	-chown 0:0 $(DESTDIR)/var/log/journal/remote
-	-chmod 755 $(DESTDIR)/var/log/journal/remote
-
-INSTALL_EXEC_HOOKS += journal-remote-install-hook
+files.sys.all += /var/log/journal/remote
+$(DESTDIR)/var/log/journal/remote:
+	$(MKDIR_P) $@
 
 nodist_pkgsysconf_DATA += \
 	src/journal-remote/journal-remote.conf
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
index 3c6b92832b..3d90f294af 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
@@ -46,6 +46,9 @@ nodist_systemunit_DATA += \
 nodist_pkgsysconf_DATA += \
         src/journal-remote/journal-upload.conf
 
+dist_sysusers_DATA += \
+	sysusers.d/systemd-journal-upload.conf
+
 endif # HAVE_LIBCURL
 
 EXTRA_DIST += \
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
index 2decc7b22e..9eeb8d2123 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <curl/curl.h>
 #include <inttypes.h>
 
 #include <systemd/sd-event.h>
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index fcf118f4d3..3c98169647 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -52,11 +52,15 @@ rootbin_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-journal-flush.service \
 	units/systemd-journal-catalog-update.service
+
 SYSINIT_TARGET_WANTS += \
 	systemd-journal-flush.service \
 	systemd-journal-catalog-update.service
+
 EXTRA_DIST += \
 	units/systemd-journal-flush.service.in \
 	units/systemd-journal-catalog-update.service.in
 
+sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/.gitignore b/src/grp-journal/libjournal-core/.gitignore
deleted file mode 100644
index 04d5852547..0000000000
--- a/src/grp-journal/libjournal-core/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/journald-gperf.c
-/libsystemd-journal.pc
-/audit_type-list.txt
-/audit_type-*-name.*
diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile
index d55aebfb49..997fcf0468 100644
--- a/src/grp-journal/libjournal-core/Makefile
+++ b/src/grp-journal/libjournal-core/Makefile
@@ -53,4 +53,6 @@ libjournal_core_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libjournal-core.la
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile
index b71b2dc494..62f19aa1b8 100644
--- a/src/grp-journal/systemd-journald/Makefile
+++ b/src/grp-journal/systemd-journald/Makefile
@@ -45,7 +45,8 @@ nodist_systemunit_DATA += \
 dist_pkgsysconf_DATA += \
 	src/journal/journald.conf
 
-dist_catalog_DATA = \
+# TODO
+_dist_catalog_DATA = \
 	catalog/systemd.bg.catalog \
 	catalog/systemd.be.catalog \
 	catalog/systemd.be@latin.catalog \