diff options
35 files changed, 228 insertions, 168 deletions
diff --git a/Makefile.am b/Makefile.am index 056d04db28..6775b04d05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3219,6 +3219,7 @@ libsystemd_la_LIBADD = \ $(libsystemd_internal_la_LIBADD) \ $(libsystemd_journal_internal_la_LIBADD) +#@discard.mk libsystemd-install-hook: libname=libsystemd.so && $(move-to-rootlibdir) @@ -3228,6 +3229,7 @@ libsystemd-uninstall-hook: INSTALL_EXEC_HOOKS += libsystemd-install-hook UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook +#@src/libsystemd/Makefile pkgconfiglib_DATA += \ src/libsystemd/libsystemd.pc @@ -3243,6 +3245,8 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd.la +# ------------------------------------------------------------------------------ + tests += \ test-bus-marshal \ test-bus-signature \ @@ -3602,6 +3606,7 @@ pkgconfiglib_DATA += \ EXTRA_DIST += \ src/libudev/libudev.pc.in +#@discard.mk # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libudev-install-hook: libname=libudev.so && $(move-to-rootlibdir) @@ -5970,7 +5975,7 @@ EXTRA_DIST += \ src/compat-libs/libsystemd-id128.pc.in \ src/compat-libs/libsystemd-daemon.pc.in -#@discard.mk ------------------------------------------------------------------- +#@build-aux/Makefile.once.head/20-systemd.mk ----------------------------------- substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ '|rootbindir=$(rootbindir)|' \ @@ -6036,15 +6041,18 @@ SED_PROCESS = \ $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ < $< > $@ +#@discard.mk units/%: units/%.in $(SED_PROCESS) man/%: man/%.in $(SED_PROCESS) +#@build-aux/Makefile.each.tail/20-systemd.mk sysctl.d/%: sysctl.d/%.in $(SED_PROCESS) +#@discard.mk %.pc: %.pc.in $(SED_PROCESS) @@ -6066,6 +6074,7 @@ shell-completion/%: shell-completion/%.in %.conf: %.conf.in $(SED_PROCESS) +#@build-aux/Makefile.each.tail/20-systemd.mk %.sh: %.sh.in $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ @@ -6078,6 +6087,7 @@ src/%: src/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ +#@discard.mk sysusers.d/%: sysusers.d/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk index 48963c2a22..c1cad10809 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-systemd.mk @@ -1,3 +1,26 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + -include $(outdir)/$(DEPDIR)/*.P* std.clean_files += *.o *.lo .deps/ .libs/ @@ -16,3 +39,16 @@ $(outdir)/%.la: $(DESTDIR)$(libdir)/%.so: $(outdir)/%.la $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $< $(@D) + +$(outdir)/%: $(srcdir)/%.in + $(SED_PROCESS) + +$(outdir)/%.sh: $(srcdir)/%.sh.in + $(SED_PROCESS) + $(AM_V_GEN)chmod +x $@ + +$(outdir)/%.c: $(srcdir)/%.gperf + $(AM_V_GPERF)$(GPERF) < $< > $@ + +$(outdir)/%: $(srcdir)/%.m4 $(top_builddir)/config.status + $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 701a9b8377..58af0f7cc8 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -119,6 +119,71 @@ INTLTOOL_V_MERGE_1 = $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ +substitutions = \ + '|libexecdir=$(libexecdir)|' \ + '|bindir=$(bindir)|' \ + '|bindir=$(bindir)|' \ + '|SYSTEMCTL=$(bindir)/systemctl|' \ + '|SYSTEMD_NOTIFY=$(bindir)/systemd-notify|' \ + '|pkgsysconfdir=$(pkgsysconfdir)|' \ + '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \ + '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \ + '|pkgdatadir=$(pkgdatadir)|' \ + '|systemunitdir=$(systemunitdir)|' \ + '|userunitdir=$(userunitdir)|' \ + '|systempresetdir=$(systempresetdir)|' \ + '|userpresetdir=$(userpresetdir)|' \ + '|udevhwdbdir=$(udevhwdbdir)|' \ + '|udevrulesdir=$(udevrulesdir)|' \ + '|catalogdir=$(catalogdir)|' \ + '|tmpfilesdir=$(tmpfilesdir)|' \ + '|sysusersdir=$(sysusersdir)|' \ + '|sysctldir=$(sysctldir)|' \ + '|systemgeneratordir=$(systemgeneratordir)|' \ + '|usergeneratordir=$(usergeneratordir)|' \ + '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \ + '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ + '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ + '|PACKAGE_URL=$(PACKAGE_URL)|' \ + '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \ + '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \ + '|prefix=$(prefix)|' \ + '|exec_prefix=$(exec_prefix)|' \ + '|libdir=$(libdir)|' \ + '|includedir=$(includedir)|' \ + '|VERSION=$(VERSION)|' \ + '|prefix=$(prefix)|' \ + '|udevlibexecdir=$(udevlibexecdir)|' \ + '|SUSHELL=$(SUSHELL)|' \ + '|SULOGIN=$(SULOGIN)|' \ + '|DEBUGTTY=$(DEBUGTTY)|' \ + '|KILL=$(KILL)|' \ + '|KMOD=$(KMOD)|' \ + '|MOUNT_PATH=$(MOUNT_PATH)|' \ + '|UMOUNT_PATH=$(UMOUNT_PATH)|' \ + '|MKDIR_P=$(MKDIR_P)|' \ + '|QUOTAON=$(QUOTAON)|' \ + '|QUOTACHECK=$(QUOTACHECK)|' \ + '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \ + '|VARLOGDIR=$(varlogdir)|' \ + '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ + '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ + '|PYTHON=$(PYTHON)|' \ + '|NTP_SERVERS=$(NTP_SERVERS)|' \ + '|DNS_SERVERS=$(DNS_SERVERS)|' \ + '|systemuidmax=$(SYSTEM_UID_MAX)|' \ + '|systemgidmax=$(SYSTEM_GID_MAX)|' \ + '|TTY_GID=$(TTY_GID)|' \ + '|systemsleepdir=$(systemsleepdir)|' \ + '|systemshutdowndir=$(systemshutdowndir)|' \ + '|binfmtdir=$(binfmtdir)|' \ + '|modulesloaddir=$(modulesloaddir)|' + +SED_PROCESS = \ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ + < $< > $@ + # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) diff --git a/config.mk.in b/config.mk.in index 7768f74c6e..f94e107c01 100644 --- a/config.mk.in +++ b/config.mk.in @@ -69,15 +69,15 @@ sysusersdir=$(prefix)/lib/sysusers.d sysctldir=$(prefix)/lib/sysctl.d binfmtdir=$(prefix)/lib/binfmt.d modulesloaddir=$(prefix)/lib/modules-load.d -networkdir=$(rootprefix)/lib/systemd/network +networkdir=$(prefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd -systemgeneratordir=$(rootlibexecdir)/system-generators +systemgeneratordir=$(libexecdir)/system-generators usergeneratordir=$(prefix)/lib/systemd/user-generators -systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemsleepdir=$(rootlibexecdir)/system-sleep -systemunitdir=$(rootprefix)/lib/systemd/system -systempresetdir=$(rootprefix)/lib/systemd/system-preset -udevlibexecdir=$(rootprefix)/lib/udev +systemshutdowndir=$(libexecdir)/system-shutdown +systemsleepdir=$(libexecdir)/system-sleep +systemunitdir=$(prefix)/lib/systemd/system +systempresetdir=$(prefix)/lib/systemd/system-preset +udevlibexecdir=$(prefix)/lib/udev udevhomedir=$(udevlibexecdir) udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d @@ -88,9 +88,9 @@ factory_pamdir = $(datadir)/factory/etc/pam.d bootlibdir = $(prefix)/lib/systemd/boot/efi # And these are the special ones for / -rootprefix=@rootprefix@ -rootbindir=$(rootprefix)/bin -rootlibexecdir=$(rootprefix)/lib/systemd +prefix=@prefix@ +bindir=$(prefix)/bin +libexecdir=$(prefix)/lib/systemd # Libraries we depend on libbasic.CPPFLAGS = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic diff --git a/discard.mk b/discard.mk index d292f3b893..26bd1fb32a 100644 --- a/discard.mk +++ b/discard.mk @@ -101,18 +101,18 @@ AM_CPPFLAGS = \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \ -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \ - -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ - -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ - -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" \ - -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ - -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \ - -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ - -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ + -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\" \ + -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\" \ + -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\" \ + -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(libexecdir)/systemd-shutdown\" \ + -DSYSTEMD_SLEEP_BINARY_PATH=\"$(libexecdir)/systemd-sleep\" \ + -DSYSTEMCTL_BINARY_PATH=\"$(bindir)/systemctl\" \ + -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ - -DROOTPREFIX=\"$(rootprefix)\" \ + -DROOTPREFIX=\"$(prefix)\" \ -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \ -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \ - -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ + -DSYSTEMD_CRYPTSETUP_PATH=\"$(libexecdir)/systemd-cryptsetup\" \ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ @@ -126,8 +126,8 @@ AM_CPPFLAGS = \ -DMOUNT_PATH=\"$(MOUNT_PATH)\" \ -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" \ -DLIBDIR=\"$(libdir)\" \ - -DROOTLIBDIR=\"$(rootlibdir)\" \ - -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ + -DROOTLIBDIR=\"$(libdir)\" \ + -DROOTLIBEXECDIR=\"$(libexecdir)\" \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/basic \ @@ -164,13 +164,13 @@ AM_CFLAGS = $(OUR_CFLAGS) AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ -define move-to-rootlibdir - if test "$(libdir)" != "$(rootlibdir)"; then \ - $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ +define move-to-libdir + if test "$(libdir)" != "$(libdir)"; then \ + $(MKDIR_P) $(DESTDIR)$(libdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ rm -f $(DESTDIR)$(libdir)/$$libname && \ - $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ - mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ + $(LN_S) --relative -f $(DESTDIR)$(libdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ + mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(libdir); \ fi endef @@ -260,7 +260,7 @@ INSTALL_EXEC_HOOKS += \ INSTALL_EXEC_HOOKS += \ install-busnames-target-wants-hook -rootbin_PROGRAMS = \ +bin_PROGRAMS = \ systemctl \ systemd-notify \ systemd-ask-password \ @@ -279,7 +279,7 @@ bin_PROGRAMS = \ systemd-stdio-bridge \ systemd-path -rootlibexec_PROGRAMS = \ +libexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ @@ -295,7 +295,7 @@ rootlibexec_PROGRAMS = \ systemd-update-done ifneq ($(HAVE_UTMP),) -rootlibexec_PROGRAMS += \ +libexec_PROGRAMS += \ systemd-update-utmp endif @@ -775,6 +775,32 @@ endif endif endif +libsystemd-install-hook: + libname=libsystemd.so && $(move-to-libdir) + +libsystemd-uninstall-hook: + rm -f $(DESTDIR)$(libdir)/libsystemd.so* + +INSTALL_EXEC_HOOKS += libsystemd-install-hook +UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook + +# move lib from $(libdir) to $(libdir) and update devel link, if needed +libudev-install-hook: + libname=libudev.so && $(move-to-libdir) + +libudev-uninstall-hook: + rm -f $(DESTDIR)$(libdir)/libudev.so* + +INSTALL_EXEC_HOOKS += libudev-install-hook +UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libudev-internal.la + +libudev_internal_la_SOURCES =\ + $(libudev_la_SOURCES) + EXTRA_DIST += \ test/Makefile \ test/README.testsuite \ @@ -812,80 +838,12 @@ EXTRA_DIST += \ test/loopy.service.d \ test/loopy.service.d/compat.conf -substitutions = \ - '|rootlibexecdir=$(rootlibexecdir)|' \ - '|rootbindir=$(rootbindir)|' \ - '|bindir=$(bindir)|' \ - '|SYSTEMCTL=$(rootbindir)/systemctl|' \ - '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ - '|pkgsysconfdir=$(pkgsysconfdir)|' \ - '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \ - '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \ - '|pkgdatadir=$(pkgdatadir)|' \ - '|systemunitdir=$(systemunitdir)|' \ - '|userunitdir=$(userunitdir)|' \ - '|systempresetdir=$(systempresetdir)|' \ - '|userpresetdir=$(userpresetdir)|' \ - '|udevhwdbdir=$(udevhwdbdir)|' \ - '|udevrulesdir=$(udevrulesdir)|' \ - '|catalogdir=$(catalogdir)|' \ - '|tmpfilesdir=$(tmpfilesdir)|' \ - '|sysusersdir=$(sysusersdir)|' \ - '|sysctldir=$(sysctldir)|' \ - '|systemgeneratordir=$(systemgeneratordir)|' \ - '|usergeneratordir=$(usergeneratordir)|' \ - '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \ - '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ - '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ - '|PACKAGE_URL=$(PACKAGE_URL)|' \ - '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \ - '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \ - '|prefix=$(prefix)|' \ - '|exec_prefix=$(exec_prefix)|' \ - '|libdir=$(libdir)|' \ - '|includedir=$(includedir)|' \ - '|VERSION=$(VERSION)|' \ - '|rootprefix=$(rootprefix)|' \ - '|udevlibexecdir=$(udevlibexecdir)|' \ - '|SUSHELL=$(SUSHELL)|' \ - '|SULOGIN=$(SULOGIN)|' \ - '|DEBUGTTY=$(DEBUGTTY)|' \ - '|KILL=$(KILL)|' \ - '|KMOD=$(KMOD)|' \ - '|MOUNT_PATH=$(MOUNT_PATH)|' \ - '|UMOUNT_PATH=$(UMOUNT_PATH)|' \ - '|MKDIR_P=$(MKDIR_P)|' \ - '|QUOTAON=$(QUOTAON)|' \ - '|QUOTACHECK=$(QUOTACHECK)|' \ - '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \ - '|VARLOGDIR=$(varlogdir)|' \ - '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ - '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ - '|PYTHON=$(PYTHON)|' \ - '|NTP_SERVERS=$(NTP_SERVERS)|' \ - '|DNS_SERVERS=$(DNS_SERVERS)|' \ - '|systemuidmax=$(SYSTEM_UID_MAX)|' \ - '|systemgidmax=$(SYSTEM_GID_MAX)|' \ - '|TTY_GID=$(TTY_GID)|' \ - '|systemsleepdir=$(systemsleepdir)|' \ - '|systemshutdowndir=$(systemshutdowndir)|' \ - '|binfmtdir=$(binfmtdir)|' \ - '|modulesloaddir=$(modulesloaddir)|' - -SED_PROCESS = \ - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ - < $< > $@ - $(outdir)/%: units/%.in $(SED_PROCESS) $(outdir)/%: man/%.in $(SED_PROCESS) -$(outdir)/%: sysctl.d/%.in - $(SED_PROCESS) - %.pc: %.pc.in $(SED_PROCESS) @@ -907,18 +865,6 @@ $(outdir)/%: shell-completion/%.in %.conf: %.conf.in $(SED_PROCESS) -%.sh: %.sh.in - $(SED_PROCESS) - $(AM_V_GEN)chmod +x $@ - -$(outdir)/%.c: src/%.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GPERF)$(GPERF) < $< > $@ - -$(outdir)/%: src/%.m4 $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ - $(outdir)/%: sysusers.d/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ @@ -1147,7 +1093,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ - --with-rootprefix=$$dc_install_base \ + --with-prefix=$$dc_install_base \ --enable-compat-libs ifneq ($(HAVE_SYSV_COMPAT),) @@ -1170,7 +1116,7 @@ endif .PHONY: dist-check-help -dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) +dist-check-help: $(bin_PROGRAMS) $(bin_PROGRAMS) for i in $(abspath $^); do \ if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \ echo "$(basename $$i) --help output is too wide:"; \ @@ -141,7 +141,10 @@ fixup_includes() ( fixup_makefile() { sed -r \ -e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \ - -e 's|^if (.*)|ifneq ($(\1),)|' + -e 's|^if (.*)|ifneq ($(\1),)|' \ + -e 's|rootprefix|prefix|g' \ + -e 's|rootbin|bin|g' \ + -e 's|rootlib|lib|g' } fixup_makefiles() ( 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 |