Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	config.mk.in

51 files changed, 62 insertions, 62 deletions

diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index 5536bcf268..083a80571a 100644
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
@@ -50,7 +50,7 @@ dist_systemunit_DATA += \
 SOCKETS_TARGET_WANTS += \
 	systemd-coredump.socket
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-coredump
 
 dist_pkgsysconf_DATA += \
diff --git a/src/grp-hostname/Makefile b/src/grp-hostname/Makefile
index f601560f0a..911188454c 100644
--- a/src/grp-hostname/Makefile
+++ b/src/grp-hostname/Makefile
@@ -30,7 +30,7 @@ systemd_hostnamed_SOURCES = \
 systemd_hostnamed_LDADD = \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-hostnamed
 
 nodist_systemunit_DATA += \
diff --git a/src/grp-import/Makefile b/src/grp-import/Makefile
index a918dd5344..62e55c17a8 100644
--- a/src/grp-import/Makefile
+++ b/src/grp-import/Makefile
@@ -31,7 +31,7 @@ ifneq ($(HAVE_ZLIB),)
 ifneq ($(HAVE_BZIP2),)
 ifneq ($(HAVE_GCRYPT),)
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-importd \
 	systemd-pull \
 	systemd-import \
@@ -42,9 +42,9 @@ systemd_importd_SOURCES = \
 
 systemd_importd_CFLAGS = \
 	$(AM_CFLAGS) \
-	-D SYSTEMD_PULL_PATH=\"$(libexecdir)/systemd-pull\" \
-	-D SYSTEMD_IMPORT_PATH=\"$(libexecdir)/systemd-import\" \
-	-D SYSTEMD_EXPORT_PATH=\"$(libexecdir)/systemd-export\"
+	-D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
+	-D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
+	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
 
 systemd_importd_LDADD = \
 	libshared.la
@@ -75,7 +75,7 @@ systemd_pull_CFLAGS = \
 	$(ZLIB_CFLAGS) \
 	$(BZIP2_CFLAGS) \
 	$(GCRYPT_CFLAGS) \
-	-D VENDOR_KEYRING_PATH=\"$(libexecdir)/import-pubring.gpg\" \
+	-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
 	-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
 
 systemd_pull_LDADD = \
@@ -134,7 +134,7 @@ systemd_export_LDADD = \
 	$(ZLIB_LIBS) \
 	$(BZIP2_LIBS)
 
-dist_libexec_DATA = \
+dist_rootlibexec_DATA = \
 	src/import/import-pubring.gpg
 
 nodist_systemunit_DATA += \
diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal-remote/systemd-journal-gatewayd/Makefile
index ed1dfbf301..05df34a71d 100644
--- a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal-remote/systemd-journal-gatewayd/Makefile
@@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 ifneq ($(HAVE_MICROHTTPD),)
 gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
diff --git a/src/grp-journal-remote/systemd-journal-remote/Makefile b/src/grp-journal-remote/systemd-journal-remote/Makefile
index 5e730f9fa6..05af76afc2 100644
--- a/src/grp-journal-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal-remote/systemd-journal-remote/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_MICROHTTPD),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-journal-remote
 
 systemd_journal_remote_SOURCES = \
diff --git a/src/grp-journal-remote/systemd-journal-upload/Makefile b/src/grp-journal-remote/systemd-journal-upload/Makefile
index 4d8fba8fd0..c47fcf0128 100644
--- a/src/grp-journal-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal-remote/systemd-journal-upload/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_LIBCURL),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
         systemd-journal-upload
 
 systemd_journal_upload_SOURCES = \
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index 188a3487e4..fcefb81581 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -135,7 +135,7 @@ UNINSTALL_EXEC_HOOKS += journal-uninstall-hook
 # Update catalog on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
 catalog-update-hook:
-	-test -n "$(DESTDIR)" || $(bindir)/journalctl --update-catalog
+	-test -n "$(DESTDIR)" || $(rootbindir)/journalctl --update-catalog
 
 INSTALL_DATA_HOOKS += \
 	catalog-update-hook
diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile
index 53046d1ce3..755e2d2c36 100644
--- a/src/grp-journal/systemd-journald/Makefile
+++ b/src/grp-journal/systemd-journald/Makefile
@@ -38,10 +38,10 @@ systemd_cat_LDADD = \
 	libjournal-core.la
 
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-journald
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	journalctl
 
 bin_PROGRAMS += \
diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile
index ad60553af9..b34c066ec2 100644
--- a/src/grp-locale/Makefile
+++ b/src/grp-locale/Makefile
@@ -41,7 +41,7 @@ nodist_systemunit_DATA += \
 dist_systemunit_DATA_busnames += \
 	units/org.freedesktop.locale1.busname
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-localed
 
 dist_dbuspolicy_DATA += \
diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
index b3f053c0c2..d03408cf11 100644
--- a/src/grp-login/Makefile
+++ b/src/grp-login/Makefile
@@ -70,7 +70,7 @@ endif # HAVE_ACL
 noinst_LTLIBRARIES += \
 	liblogind-core.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-logind
 
 loginctl_SOURCES = \
@@ -81,7 +81,7 @@ loginctl_SOURCES = \
 loginctl_LDADD = \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	loginctl
 
 dist_bashcompletion_data += \
@@ -97,7 +97,7 @@ systemd_inhibit_SOURCES = \
 systemd_inhibit_LDADD = \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	systemd-inhibit
 
 test_login_SOURCES = \
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile
index 556256eada..a3ad40e59c 100644
--- a/src/grp-machine/machinectl/Makefile
+++ b/src/grp-machine/machinectl/Makefile
@@ -29,7 +29,7 @@ machinectl_SOURCES = \
 machinectl_LDADD = \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	machinectl
 
 dist_bashcompletion_data += \
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 59540c18c4..8aac7b0f4f 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -30,7 +30,7 @@ systemd_machined_SOURCES = \
 systemd_machined_LDADD = \
 	libmachine-core.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-machined
 
 nodist_systemunit_DATA += \
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
index bed26253e8..49928fc5ef 100644
--- a/src/grp-network/Makefile
+++ b/src/grp-network/Makefile
@@ -30,7 +30,7 @@ dist_network_DATA = \
 	network/80-container-vz.network
 
 ifneq ($(ENABLE_NETWORKD),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-networkd
 
 systemd_networkd_SOURCES = \
@@ -111,7 +111,7 @@ libnetworkd_core_la_LIBADD = \
 	libsystemd-network.la \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-networkd-wait-online
 
 systemd_networkd_wait_online_CFLAGS = \
@@ -129,7 +129,7 @@ systemd_networkd_wait_online_LDADD = \
 	libsystemd-network.la \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	networkctl
 
 networkctl_SOURCES = \
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 0677403a03..8d26124091 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -103,7 +103,7 @@ systemd_resolved_LDADD = \
 	libsystemd-network.la \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-resolved
 
 nodist_systemunit_DATA += \
diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
index 8285554005..24585cc12b 100644
--- a/src/grp-system/systemctl/Makefile
+++ b/src/grp-system/systemctl/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbit_PROGRAMS += systemctl
+rootbin_PROGRAMS += systemctl
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index a36e925347..cfef258c6d 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd
+rootlibexec_PROGRAMS += systemd
 systemd_SOURCES = \
 	src/core/main.c
 
diff --git a/src/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile
index b1f80252e8..5d397e0bb0 100644
--- a/src/grp-timedate/systemd-timedated/Makefile
+++ b/src/grp-timedate/systemd-timedated/Makefile
@@ -30,7 +30,7 @@ systemd_timedated_SOURCES = \
 systemd_timedated_LDADD = \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-timedated
 
 dist_dbussystemservice_DATA += \
diff --git a/src/grp-udev/systemd-udevd/Makefile b/src/grp-udev/systemd-udevd/Makefile
index f9ddfa6aad..5bbc548cfe 100644
--- a/src/grp-udev/systemd-udevd/Makefile
+++ b/src/grp-udev/systemd-udevd/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-udevd
 
 systemd_udevd_SOURCES = \
diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
index 58a3f8cf72..e3c5ed351f 100644
--- a/src/grp-udev/udevadm/Makefile
+++ b/src/grp-udev/udevadm/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	udevadm
 
 udevadm_SOURCES = \
diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile
index c2d8f89c33..aa8912d711 100644
--- a/src/systemd-ac-power/Makefile
+++ b/src/systemd-ac-power/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-ac-power
+rootlibexec_PROGRAMS += systemd-ac-power
 systemd_ac_power_SOURCES = \
 	src/ac-power/ac-power.c
 
diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile
index 2a62917488..4a79cd838a 100644
--- a/src/systemd-ask-password/Makefile
+++ b/src/systemd-ask-password/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbit_PROGRAMS += systemd-ask-password
+rootbin_PROGRAMS += systemd-ask-password
 systemd_ask_password_SOURCES = \
 	src/ask-password/ask-password.c
 
diff --git a/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile
index 115285ec40..a1919a5c85 100644
--- a/src/systemd-backlight/Makefile
+++ b/src/systemd-backlight/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_BACKLIGHT),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-backlight
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile
index 6f520311e4..77dcd56942 100644
--- a/src/systemd-binfmt/Makefile
+++ b/src/systemd-binfmt/Makefile
@@ -30,7 +30,7 @@ systemd_binfmt_SOURCES = \
 systemd_binfmt_LDADD = \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-binfmt
 
 dist_systemunit_DATA += \
diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile
index a906ed3ce3..05ff1f6b49 100644
--- a/src/systemd-cgroups-agent/Makefile
+++ b/src/systemd-cgroups-agent/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-cgroups-agent
+rootlibexec_PROGRAMS += systemd-cgroups-agent
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent/cgroups-agent.c
 
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile
index 482bdc6fa0..ccfa2f40ac 100644
--- a/src/systemd-cryptsetup/Makefile
+++ b/src/systemd-cryptsetup/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_LIBCRYPTSETUP),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-cryptsetup
 
 systemgenerator_PROGRAMS += \
diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile
index 8886eb50db..f094a7e2a0 100644
--- a/src/systemd-escape/Makefile
+++ b/src/systemd-escape/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbit_PROGRAMS += systemd-escape
+rootbin_PROGRAMS += systemd-escape
 
 systemd_escape_SOURCES = \
 	src/escape/escape.c
diff --git a/src/systemd-firstboot/Makefile b/src/systemd-firstboot/Makefile
index 931cf485e6..09d9ebb1d7 100644
--- a/src/systemd-firstboot/Makefile
+++ b/src/systemd-firstboot/Makefile
@@ -31,7 +31,7 @@ systemd_firstboot_LDADD = \
 	libshared.la \
 	-lcrypt
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	systemd-firstboot
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile
index fb93c50d21..96537a0898 100644
--- a/src/systemd-fsck/Makefile
+++ b/src/systemd-fsck/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-fsck
+rootlibexec_PROGRAMS += systemd-fsck
 systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
 
diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile
index 4cc9bffdb2..5a8a0b4ad1 100644
--- a/src/systemd-hibernate-resume/Makefile
+++ b/src/systemd-hibernate-resume/Makefile
@@ -27,7 +27,7 @@ ifneq ($(ENABLE_HIBERNATE),)
 systemgenerator_PROGRAMS += \
 	systemd-hibernate-resume-generator
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-hibernate-resume
 
 systemd_hibernate_resume_SOURCES = \
diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile
index 9130fbcfd2..7c64c801ca 100644
--- a/src/systemd-hwdb/Makefile
+++ b/src/systemd-hwdb/Makefile
@@ -34,7 +34,7 @@ systemd_hwdb_SOURCES = \
 systemd_hwdb_LDADD = \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	systemd-hwdb
 
 dist_udevhwdb_DATA = \
@@ -59,7 +59,7 @@ SYSINIT_TARGET_WANTS += \
 # Update hwdb on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
 hwdb-update-hook:
-	-test -n "$(DESTDIR)" || $(bindir)/systemd-hwdb update
+	-test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update
 
 INSTALL_DATA_HOOKS += \
 	hwdb-update-hook
diff --git a/src/systemd-initctl/Makefile b/src/systemd-initctl/Makefile
index 726a1404d3..ae4151a081 100644
--- a/src/systemd-initctl/Makefile
+++ b/src/systemd-initctl/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-initctl
+rootlibexec_PROGRAMS += systemd-initctl
 systemd_initctl_SOURCES = \
 	src/initctl/initctl.c
 
diff --git a/src/systemd-machine-id-setup/Makefile b/src/systemd-machine-id-setup/Makefile
index ad1c4f66e2..8f210b3cdf 100644
--- a/src/systemd-machine-id-setup/Makefile
+++ b/src/systemd-machine-id-setup/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbit_PROGRAMS += systemd-machine-id-setup
+rootbin_PROGRAMS += systemd-machine-id-setup
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
 	src/core/machine-id-setup.c \
diff --git a/src/systemd-modules-load/Makefile b/src/systemd-modules-load/Makefile
index ab334e16e8..1c51b134ad 100644
--- a/src/systemd-modules-load/Makefile
+++ b/src/systemd-modules-load/Makefile
@@ -35,7 +35,7 @@ systemd_modules_load_LDADD = \
 	libshared.la \
 	$(KMOD_LIBS)
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-modules-load
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile
index 90894e5df5..06a6604e5b 100644
--- a/src/systemd-notify/Makefile
+++ b/src/systemd-notify/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbit_PROGRAMS += systemd-notify
+rootbin_PROGRAMS += systemd-notify
 systemd_notify_SOURCES = \
 	src/notify/notify.c
 
diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile
index 20400443d7..2136c1351e 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/systemd-quotacheck/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_QUOTACHECK),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-quotacheck
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile
index 1cbdeabec4..2df6252927 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/systemd-random-seed/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_RANDOMSEED),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-random-seed
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
index 9ad9586de6..29d110625a 100644
--- a/src/systemd-remount-fs/Makefile
+++ b/src/systemd-remount-fs/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-remount-fs
+rootlibexec_PROGRAMS += systemd-remount-fs
 systemd_remount_fs_SOURCES = \
 	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index ed4b22a193..b5c4698fd8 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-reply-password
+rootlibexec_PROGRAMS += systemd-reply-password
 systemd_reply_password_SOURCES = \
 	src/reply-password/reply-password.c
 
diff --git a/src/systemd-rfkill/Makefile b/src/systemd-rfkill/Makefile
index 4cb5137e63..edf5c0af42 100644
--- a/src/systemd-rfkill/Makefile
+++ b/src/systemd-rfkill/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_RFKILL),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-rfkill
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index 41782b3c7e..1017422b75 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-shutdown
+rootlibexec_PROGRAMS += systemd-shutdown
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
diff --git a/src/systemd-sleep/Makefile b/src/systemd-sleep/Makefile
index ca373cf991..cfb1a8337a 100644
--- a/src/systemd-sleep/Makefile
+++ b/src/systemd-sleep/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-sleep
+rootlibexec_PROGRAMS += systemd-sleep
 systemd_sleep_SOURCES = \
 	src/sleep/sleep.c
 
diff --git a/src/systemd-socket-proxyd/Makefile b/src/systemd-socket-proxyd/Makefile
index 07cc307abe..e3d354bd30 100644
--- a/src/systemd-socket-proxyd/Makefile
+++ b/src/systemd-socket-proxyd/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-socket-proxyd
+rootlibexec_PROGRAMS += systemd-socket-proxyd
 
 systemd_socket_proxyd_SOURCES = \
 	src/socket-proxy/socket-proxyd.c
diff --git a/src/systemd-sysctl/Makefile b/src/systemd-sysctl/Makefile
index cad10ab8c2..39ce08d5e3 100644
--- a/src/systemd-sysctl/Makefile
+++ b/src/systemd-sysctl/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-sysctl
+rootlibexec_PROGRAMS += systemd-sysctl
 systemd_sysctl_SOURCES = \
 	src/sysctl/sysctl.c
 
diff --git a/src/systemd-sysusers/Makefile b/src/systemd-sysusers/Makefile
index c9aaad0369..d18e41b1d5 100644
--- a/src/systemd-sysusers/Makefile
+++ b/src/systemd-sysusers/Makefile
@@ -30,7 +30,7 @@ systemd_sysusers_SOURCES = \
 systemd_sysusers_LDADD = \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	systemd-sysusers
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile
index 5d7e131a1f..ad037c3625 100644
--- a/src/systemd-timesyncd/Makefile
+++ b/src/systemd-timesyncd/Makefile
@@ -40,7 +40,7 @@ systemd_timesyncd_LDADD = \
 	libsystemd-network.la \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-timesyncd
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile
index c193b9c37d..1e72e31215 100644
--- a/src/systemd-tmpfiles/Makefile
+++ b/src/systemd-tmpfiles/Makefile
@@ -30,7 +30,7 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_LDADD = \
 	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	systemd-tmpfiles
 
 dist_systemunit_DATA += \
diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile
index d71f124472..b5119b5066 100644
--- a/src/systemd-tty-ask-password-agent/Makefile
+++ b/src/systemd-tty-ask-password-agent/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbit_PROGRAMS += systemd-tty-ask-password-agent
+rootbin_PROGRAMS += systemd-tty-ask-password-agent
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent/tty-ask-password-agent.c
 
diff --git a/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile
index 7b6c3bc2a5..5045982316 100644
--- a/src/systemd-update-done/Makefile
+++ b/src/systemd-update-done/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libexec_PROGRAMS += systemd-update-done
+rootlibexec_PROGRAMS += systemd-update-done
 
 systemd_update_done_SOURCES = \
 	src/update-done/update-done.c
diff --git a/src/systemd-update-utmp/Makefile b/src/systemd-update-utmp/Makefile
index c9c5f5eab2..56f8d1f4b5 100644
--- a/src/systemd-update-utmp/Makefile
+++ b/src/systemd-update-utmp/Makefile
@@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_UTMP),)
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-update-utmp
 endif # HAVE_UTMP
 
diff --git a/src/systemd-user-sessions/Makefile b/src/systemd-user-sessions/Makefile
index 4674ae3169..0586135791 100644
--- a/src/systemd-user-sessions/Makefile
+++ b/src/systemd-user-sessions/Makefile
@@ -31,7 +31,7 @@ systemd_user_sessions_SOURCES = \
 systemd_user_sessions_LDADD = \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-user-sessions
 
 nodist_systemunit_DATA += \
diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile
index 466829c1b9..e0623cf50d 100644
--- a/src/systemd-vconsole/Makefile
+++ b/src/systemd-vconsole/Makefile
@@ -30,7 +30,7 @@ systemd_vconsole_setup_SOURCES = \
 systemd_vconsole_setup_LDADD = \
 	libshared.la
 
-libexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-vconsole-setup
 
 nodist_udevrules_DATA += \