build-sys: build and install systemd-coredumpctl conditionally

If coredump support is disabled via --disable-coredump, do not build and
install the systemd-coredumpctl binary and man page.

diff --git a/Makefile-man.am b/Makefile-man.am
index e095c3e765dd00fe8707a7fb54dccc78c8f430a7..8d48ee05efada08db77b93bcfe741d4006c61340 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -50,7 +50,6 @@ MANPAGES += \
        man/systemd-cat.1 \
        man/systemd-cgls.1 \
        man/systemd-cgtop.1 \
-       man/systemd-coredumpctl.1 \
        man/systemd-delta.1 \
        man/systemd-detect-virt.1 \
        man/systemd-fsck@.service.8 \
@@ -303,6 +302,14 @@ MANPAGES_ALIAS += \
 
 endif
 
+if ENABLE_COREDUMP
+MANPAGES += \
+       man/systemd-coredumpctl.1
+MANPAGES_ALIAS += \
+       #
+
+endif
+
 if ENABLE_HOSTNAMED
 MANPAGES += \
        man/hostnamectl.1 \

diff --git a/Makefile.am b/Makefile.am
index e23a6b44829ec04a2ac8f8b3ea3b2f131baae6ef..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 = \
@@ -2376,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
 
@@ -2627,7 +2619,6 @@ rootbin_PROGRAMS += \
        journalctl
 
 bin_PROGRAMS += \
-       systemd-coredumpctl \
        systemd-cat
 
 dist_systemunit_DATA += \
@@ -2719,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
 

diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index ce40404da7ace2e55f5a7df86afc3e1731b3e673..02b688606cdc806e5d381268875f4db78bb62b1c 100644 (file)
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-coredumpctl">
+<refentry id="systemd-coredumpctl" conditional='ENABLE_COREDUMP'>
 
         <refentryinfo>
                 <title>systemd-coredumpctl</title>