build-sys: build and install systemd-coredumpctl conditionally

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f18cccd070d36ba935f84da93058670ac002cf18..3d3f2652f652c8a3070e188f774800866b160e14 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -318,7 +318,6 @@ systemd_analyze_LDADD = \
 dist_bashcompletion_DATA = \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
-       shell-completion/bash/systemd-coredumpctl \
        shell-completion/bash/udevadm
 
 dist_tmpfiles_DATA = \
@@ -343,6 +342,8 @@ dist_systemunit_DATA = \
        units/kexec.target \
        units/local-fs.target \
        units/local-fs-pre.target \
+       units/initrd-fs.target \
+       units/initrd-fs-pre.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
        units/network.target \
@@ -2374,13 +2375,6 @@ journalctl_LDADD += \
        $(QRENCODE_LIBS)
 endif
 
-systemd_coredumpctl_SOURCES = \
-       src/journal/coredumpctl.c
-
-systemd_coredumpctl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal.la
-
 test_journal_SOURCES = \
        src/journal/test-journal.c
 
@@ -2625,7 +2619,6 @@ rootbin_PROGRAMS += \
        journalctl
 
 bin_PROGRAMS += \
-       systemd-coredumpctl \
        systemd-cat
 
 dist_systemunit_DATA += \
@@ -2717,6 +2710,19 @@ endif
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
+systemd_coredumpctl_SOURCES = \
+       src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal.la
+
+bin_PROGRAMS += \
+       systemd-coredumpctl
+
+dist_bashcompletion_DATA += \
+       shell-completion/bash/systemd-coredumpctl
+
 sysctl_DATA = \
        sysctl.d/coredump.conf
 
@@ -3504,7 +3510,7 @@ sphinx-%:
        $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
 
 destdir-sphinx: all
-       dir="`mktemp -d /tmp/systemd-install.XXXXXX`" && \
+       dir="$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
                $(MAKE) DESTDIR="$$dir" install && \
                $(MAKE) DESTDIR="$$dir" sphinx-html && \
                rm -rf "$$dir"