[systemd-commits] Makefile.am Makefile-man.am man/systemd-coredumpctl.xml

[Michael Biebl]

 Makefile-man.am             |    9 ++++++++-
 Makefile.am                 |   22 +++++++++++++---------
 man/systemd-coredumpctl.xml |    2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

New commits:
commit d51167c6268d11f02c2676693a8e9dc1b628cdbb
Author: Michael Biebl <biebl at debian.org>
Date:   Mon Mar 4 23:20:16 2013 +0100

    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 e095c3e..8d48ee0 100644
--- 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 at .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 e23a6b4..3d3f265 100644
--- 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 ce40404..02b6886 100644
--- 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>