diff options
Diffstat (limited to 'src')
29 files changed, 55 insertions, 55 deletions
diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile index 0db5648f70..ef70e3e456 100644 --- a/src/bus-proxyd/Makefile +++ b/src/bus-proxyd/Makefile @@ -71,7 +71,7 @@ EXTRA_DIST += \ ifneq ($(HAVE_SMACK),) bus-proxyd-set-cap-hook: - -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd + -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(libexecdir)/systemd-bus-proxyd INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook endif diff --git a/src/coredump/Makefile b/src/coredump/Makefile index 8a4892595b..ac65ba0730 100644 --- a/src/coredump/Makefile +++ b/src/coredump/Makefile @@ -50,7 +50,7 @@ dist_systemunit_DATA += \ SOCKETS_TARGET_WANTS += \ systemd-coredump.socket -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-coredump dist_pkgsysconf_DATA += \ diff --git a/src/firstboot/Makefile b/src/firstboot/Makefile index 19d6c06c9f..3590fe3660 100644 --- a/src/firstboot/Makefile +++ b/src/firstboot/Makefile @@ -31,7 +31,7 @@ systemd_firstboot_LDADD = \ libshared.la \ -lcrypt -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ systemd-firstboot nodist_systemunit_DATA += \ diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile index 93ac163f95..ad1c19ab43 100644 --- a/src/hibernate-resume/Makefile +++ b/src/hibernate-resume/Makefile @@ -27,7 +27,7 @@ ifneq ($(ENABLE_HIBERNATE),) systemgenerator_PROGRAMS += \ systemd-hibernate-resume-generator -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-hibernate-resume systemd_hibernate_resume_SOURCES = \ diff --git a/src/hostname/Makefile b/src/hostname/Makefile index 9f4b17e94e..1a135aa65b 100644 --- a/src/hostname/Makefile +++ b/src/hostname/Makefile @@ -30,7 +30,7 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-hostnamed nodist_systemunit_DATA += \ diff --git a/src/import/Makefile b/src/import/Makefile index d602eb8325..52b1d7cd10 100644 --- a/src/import/Makefile +++ b/src/import/Makefile @@ -31,7 +31,7 @@ ifneq ($(HAVE_ZLIB),) ifneq ($(HAVE_BZIP2),) ifneq ($(HAVE_GCRYPT),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-importd \ systemd-pull \ systemd-import \ @@ -42,9 +42,9 @@ systemd_importd_SOURCES = \ systemd_importd_CFLAGS = \ $(AM_CFLAGS) \ - -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ - -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ - -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" + -D SYSTEMD_PULL_PATH=\"$(libexecdir)/systemd-pull\" \ + -D SYSTEMD_IMPORT_PATH=\"$(libexecdir)/systemd-import\" \ + -D SYSTEMD_EXPORT_PATH=\"$(libexecdir)/systemd-export\" systemd_importd_LDADD = \ libshared.la @@ -76,7 +76,7 @@ systemd_pull_CFLAGS = \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ $(GCRYPT_CFLAGS) \ - -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \ + -D VENDOR_KEYRING_PATH=\"$(libexecdir)/import-pubring.gpg\" \ -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" systemd_pull_LDADD = \ @@ -133,7 +133,7 @@ systemd_export_LDADD = \ $(ZLIB_LIBS) \ -lbz2 -dist_rootlibexec_DATA = \ +dist_libexec_DATA = \ src/import/import-pubring.gpg nodist_systemunit_DATA += \ diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile index f67a33530b..21d07f7712 100644 --- a/src/journal-remote/Makefile +++ b/src/journal-remote/Makefile @@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_MICROHTTPD),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-journal-remote systemd_journal_remote_SOURCES = \ @@ -83,7 +83,7 @@ EXTRA_DIST += \ endif ifneq ($(HAVE_LIBCURL),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-journal-upload systemd_journal_upload_SOURCES = \ diff --git a/src/journal/Makefile b/src/journal/Makefile index a24dcf3d55..c67840c42f 100644 --- a/src/journal/Makefile +++ b/src/journal/Makefile @@ -228,7 +228,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)" || $(rootbindir)/journalctl --update-catalog + -test -n "$(DESTDIR)" || $(bindir)/journalctl --update-catalog INSTALL_DATA_HOOKS += \ catalog-update-hook @@ -263,10 +263,10 @@ tests += \ endif -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-journald -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ journalctl bin_PROGRAMS += \ @@ -319,7 +319,7 @@ gperf_gperf_sources += \ ifneq ($(HAVE_MICROHTTPD),) gatewayddocumentrootdir=$(pkgdatadir)/gatewayd -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-journal-gatewayd systemd_journal_gatewayd_SOURCES = \ diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile index 44c4755d36..ff4157fb05 100644 --- a/src/libsystemd/compat-libs/Makefile +++ b/src/libsystemd/compat-libs/Makefile @@ -119,18 +119,18 @@ pkgconfiglib_DATA += \ src/compat-libs/libsystemd-id128.pc \ src/compat-libs/libsystemd-daemon.pc -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +# move lib from $(libdir) to $(libdir) and update devel link, if needed compat-lib-install-hook: - libname=libsystemd-login.so && $(move-to-rootlibdir) - libname=libsystemd-journal.so && $(move-to-rootlibdir) - libname=libsystemd-id128.so && $(move-to-rootlibdir) - libname=libsystemd-daemon.so && $(move-to-rootlibdir) + libname=libsystemd-login.so && $(move-to-libdir) + libname=libsystemd-journal.so && $(move-to-libdir) + libname=libsystemd-id128.so && $(move-to-libdir) + libname=libsystemd-daemon.so && $(move-to-libdir) compat-lib-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so* - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so* - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-login.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-journal.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-id128.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-daemon.so* INSTALL_EXEC_HOOKS += compat-lib-install-hook UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook diff --git a/src/locale/Makefile b/src/locale/Makefile index cc85aa4572..aae2c71091 100644 --- a/src/locale/Makefile +++ b/src/locale/Makefile @@ -41,7 +41,7 @@ nodist_systemunit_DATA += \ dist_systemunit_DATA_busnames += \ units/org.freedesktop.locale1.busname -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-localed dist_dbuspolicy_DATA += \ diff --git a/src/login/Makefile b/src/login/Makefile index 8b27584ec8..79ac8440b9 100644 --- a/src/login/Makefile +++ b/src/login/Makefile @@ -70,7 +70,7 @@ endif noinst_LTLIBRARIES += \ liblogind-core.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-logind loginctl_SOURCES = \ @@ -81,7 +81,7 @@ loginctl_SOURCES = \ loginctl_LDADD = \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ loginctl dist_bashcompletion_data += \ @@ -97,7 +97,7 @@ systemd_inhibit_SOURCES = \ systemd_inhibit_LDADD = \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ systemd-inhibit test_login_SOURCES = \ @@ -226,7 +226,7 @@ systemd_user_sessions_SOURCES = \ systemd_user_sessions_LDADD = \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-user-sessions nodist_systemunit_DATA += \ diff --git a/src/machine/src/Makefile b/src/machine/src/Makefile index c38b0fe635..261f24bd8d 100644 --- a/src/machine/src/Makefile +++ b/src/machine/src/Makefile @@ -31,7 +31,7 @@ systemd_machined_SOURCES = \ systemd_machined_LDADD = \ libmachine-core.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-machined libmachine_core_la_SOURCES = \ @@ -55,7 +55,7 @@ machinectl_SOURCES = \ machinectl_LDADD = \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ machinectl test_machine_tables_SOURCES = \ diff --git a/src/modules-load/Makefile b/src/modules-load/Makefile index 50efc76b09..f57d7bcf40 100644 --- a/src/modules-load/Makefile +++ b/src/modules-load/Makefile @@ -35,7 +35,7 @@ systemd_modules_load_LDADD = \ libshared.la \ $(KMOD_LIBS) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-modules-load nodist_systemunit_DATA += \ diff --git a/src/network/Makefile b/src/network/Makefile index 803bc3b400..59304feac7 100644 --- a/src/network/Makefile +++ b/src/network/Makefile @@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(ENABLE_NETWORKD),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-networkd systemd_networkd_SOURCES = \ @@ -100,7 +100,7 @@ libnetworkd_core_la_LIBADD = \ libsystemd-network.la \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_CFLAGS = \ @@ -118,7 +118,7 @@ systemd_networkd_wait_online_LDADD = \ libsystemd-network.la \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ networkctl networkctl_SOURCES = \ diff --git a/src/resolve/src/Makefile b/src/resolve/src/Makefile index 1a882e5161..67708841c0 100644 --- a/src/resolve/src/Makefile +++ b/src/resolve/src/Makefile @@ -88,7 +88,7 @@ systemd_resolved_LDADD = \ libsystemd-network.la \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-resolved nodist_systemunit_DATA += \ diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile index 938c7d2499..8659cb1beb 100644 --- a/src/systemd-activate/Makefile +++ b/src/systemd-activate/Makefile @@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-activate systemd_activate_SOURCES = \ diff --git a/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile index cf61f8f477..fba1381e00 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),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-backlight nodist_systemunit_DATA += \ diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile index a465a1dc7f..c109d2a91f 100644 --- a/src/systemd-binfmt/Makefile +++ b/src/systemd-binfmt/Makefile @@ -30,7 +30,7 @@ systemd_binfmt_SOURCES = \ systemd_binfmt_LDADD = \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-binfmt dist_systemunit_DATA += \ diff --git a/src/systemd-bootchart/Makefile b/src/systemd-bootchart/Makefile index 79ee43bbb9..e564e1bfd9 100644 --- a/src/systemd-bootchart/Makefile +++ b/src/systemd-bootchart/Makefile @@ -35,7 +35,7 @@ systemd_bootchart_SOURCES = \ systemd_bootchart_LDADD = \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-bootchart dist_pkgsysconf_DATA += \ diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index 2287f347b9..98c6b4526b 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),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-cryptsetup systemgenerator_PROGRAMS += \ diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile index 8675511274..13ce002e4d 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),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-quotacheck nodist_systemunit_DATA += \ diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile index 69b2cf4b8a..ca4e0487ac 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),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-random-seed nodist_systemunit_DATA += \ diff --git a/src/systemd-rfkill/Makefile b/src/systemd-rfkill/Makefile index e2dda8d8e0..ef647fd723 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),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-rfkill nodist_systemunit_DATA += \ diff --git a/src/systemd-timedate/Makefile b/src/systemd-timedate/Makefile index 7584e4d0a7..d779526ed4 100644 --- a/src/systemd-timedate/Makefile +++ b/src/systemd-timedate/Makefile @@ -30,7 +30,7 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-timedated dist_dbussystemservice_DATA += \ diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile index 15d5bc1718..0f75e30e06 100644 --- a/src/systemd-timesync/Makefile +++ b/src/systemd-timesync/Makefile @@ -40,7 +40,7 @@ systemd_timesyncd_LDADD = \ libsystemd-network.la \ libshared.la -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-timesyncd nodist_systemunit_DATA += \ diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile index 88ea973bae..d5bfee8578 100644 --- a/src/systemd-tmpfiles/Makefile +++ b/src/systemd-tmpfiles/Makefile @@ -30,7 +30,7 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_LDADD = \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ systemd-tmpfiles dist_systemunit_DATA += \ diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile index 4c186c1deb..d386153140 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 -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-vconsole-setup nodist_udevrules_DATA += \ diff --git a/src/sysusers/Makefile b/src/sysusers/Makefile index 6060eca737..7b74450242 100644 --- a/src/sysusers/Makefile +++ b/src/sysusers/Makefile @@ -30,7 +30,7 @@ systemd_sysusers_SOURCES = \ systemd_sysusers_LDADD = \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ systemd-sysusers nodist_systemunit_DATA += \ diff --git a/src/udev/Makefile b/src/udev/Makefile index 664afb9568..6b9958ebaa 100644 --- a/src/udev/Makefile +++ b/src/udev/Makefile @@ -74,10 +74,10 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ udevadm -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-udevd noinst_LTLIBRARIES += \ @@ -190,7 +190,7 @@ systemd_hwdb_SOURCES = \ systemd_hwdb_LDADD = \ libshared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ systemd-hwdb dist_udevhwdb_DATA = \ @@ -215,7 +215,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)" || $(rootbindir)/systemd-hwdb update + -test -n "$(DESTDIR)" || $(bindir)/systemd-hwdb update INSTALL_DATA_HOOKS += \ hwdb-update-hook |