17 files changed, 60 insertions, 35 deletions
diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile
index 922d8a32d3..418f942c0a 100644
--- a/src/grp-boot/Makefile
+++ b/src/grp-boot/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += bootctl systemd-boot
+nested.subdirs += bootctl systemd-boot
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile
index 84253d2387..a983e32a9f 100644
--- a/src/grp-boot/bootctl/Makefile
+++ b/src/grp-boot/bootctl/Makefile
@@ -51,4 +51,5 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
 endif # HAVE_BLKID
 endif # ENABLE_EFI
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile
index 2e604d7b86..811efb5af5 100644
--- a/src/grp-coredump/Makefile
+++ b/src/grp-coredump/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += coredumpctl systemd-coredump
+nested.subdirs += coredumpctl systemd-coredump
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/systemd-coredump/systemd-coredump.tmpfiles b/src/grp-coredump/systemd-coredump/systemd-coredump.tmpfiles
new file mode 100644
index 0000000000..02b052583d
--- /dev/null
+++ b/src/grp-coredump/systemd-coredump/systemd-coredump.tmpfiles
@@ -0,0 +1,10 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+d /var/lib/systemd/coredump 0755 root root 3d
diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile
index 4a18cd13bb..e4980fac9a 100644
--- a/src/grp-journal/grp-remote/Makefile
+++ b/src/grp-journal/grp-remote/Makefile
@@ -86,8 +86,8 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
-at.subdirs += systemd-journa-gatewayd
-at.subdirs += systemd-journa-remote
-at.subdirs += systemd-journa-upload
+nested.subdirs += systemd-journa-gatewayd
+nested.subdirs += systemd-journa-remote
+nested.subdirs += systemd-journa-upload
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 b/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4
index 2cd58e9121..1fe0f7acfc 100644
--- a/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4
+++ b/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4
@@ -7,23 +7,6 @@
 
 # See tmpfiles.d(5) for details
 
-d /run/user 0755 root root -
-F! /run/utmp 0664 root utmp -
-
-d /run/systemd/ask-password 0755 root root -
-d /run/systemd/seats 0755 root root -
-d /run/systemd/sessions 0755 root root -
-d /run/systemd/users 0755 root root -
-d /run/systemd/machines 0755 root root -
-d /run/systemd/shutdown 0755 root root -
-m4_ifdef(`ENABLE_NETWORKD',
-d /run/systemd/netif 0755 systemd-network systemd-network -
-d /run/systemd/netif/links 0755 systemd-network systemd-network -
-d /run/systemd/netif/leases 0755 systemd-network systemd-network -
-)m4_dnl
-
-d /run/log 0755 root root -
-
 z /run/log/journal 2755 root systemd-journal - -
 Z /run/log/journal/%m ~2750 root systemd-journal - -
 m4_ifdef(`HAVE_ACL',`m4_dnl
@@ -68,6 +51,3 @@ a+ /var/log/journal/%m - - - - d:group:wheel:r-x
 a+ /var/log/journal/%m - - - - group:wheel:r-x
 a+ /var/log/journal/%m/system.journal - - - - group:wheel:r--
 '')')')m4_dnl
-
-d /var/lib/systemd 0755 root root -
-d /var/lib/systemd/coredump 0755 root root 3d
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index 7412341233..a724b63ceb 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += machinectl systemd-machined
-at.subdirs += nss-mymachines
+nested.subdirs += machinectl systemd-machined
+nested.subdirs += nss-mymachines
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/systemd-networkd/systemd-networkd.tmpfiles b/src/grp-network/systemd-networkd/systemd-networkd.tmpfiles
new file mode 100644
index 0000000000..24197555ee
--- /dev/null
+++ b/src/grp-network/systemd-networkd/systemd-networkd.tmpfiles
@@ -0,0 +1,12 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+d /run/systemd/netif 0755 systemd-network systemd-network -
+d /run/systemd/netif/links 0755 systemd-network systemd-network -
+d /run/systemd/netif/leases 0755 systemd-network systemd-network -
diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile
index ae0c5a2466..4cea7de4c6 100644
--- a/src/grp-resolve/Makefile
+++ b/src/grp-resolve/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemd-resolved nss-resolve
+nested.subdirs += systemd-resolved nss-resolve
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile
index ea8b031596..546ff4e88f 100644
--- a/src/grp-system/Makefile
+++ b/src/grp-system/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemctl systemd
+nested.subdirs += systemctl systemd
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemd/systemd.tmpfiles b/src/grp-system/systemd/systemd.tmpfiles
new file mode 100644
index 0000000000..0a7c85d9ec
--- /dev/null
+++ b/src/grp-system/systemd/systemd.tmpfiles
@@ -0,0 +1,22 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+d /run/user 0755 root root -
+F! /run/utmp 0664 root utmp -
+
+d /run/systemd/ask-password 0755 root root -
+d /run/systemd/seats 0755 root root -
+d /run/systemd/sessions 0755 root root -
+d /run/systemd/users 0755 root root -
+d /run/systemd/machines 0755 root root -
+d /run/systemd/shutdown 0755 root root -
+
+d /run/log 0755 root root -
+
+d /var/lib/systemd 0755 root root -
diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile
index bb8be753da..01c4f2f841 100644
--- a/src/grp-timedate/Makefile
+++ b/src/grp-timedate/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += timedatectl systemd-timedated
+nested.subdirs += timedatectl systemd-timedated
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
index 45d408fa19..47ce9cf936 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -23,5 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += src include
+nested.subdirs += src include
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/Makefile b/src/libbasic/include/Makefile
index 0aa8325a7e..d3a3e62a0e 100644
--- a/src/libbasic/include/Makefile
+++ b/src/libbasic/include/Makefile
@@ -23,5 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += basic
+nested.subdirs += basic
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 7ed2706100..d6a307fc5a 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -23,5 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += src
+nested.subdirs += src
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile
index 96f14f58f2..afd9224056 100644
--- a/src/libsystemd-network/Makefile
+++ b/src/libsystemd-network/Makefile
@@ -23,5 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += src test
+nested.subdirs += src test
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index 8d9fecb1fb..369b265ff7 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += src
+nested.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk