From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 13 Feb 2012 00:11:22 +0000 (+0100)
Subject: build-sys: simplify ENABLE_MANPAGES
X-Git-Tag: v43~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9941a4b94f6ee3c4f5906c32821f82aa3c6e2b1;p=systemd

build-sys: simplify ENABLE_MANPAGES
---

diff --git a/Makefile.am b/Makefile.am
index 6e9259be..983ea165 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -651,7 +651,6 @@ EXTRA_DIST += \
 	src/acl-util.h \
 	src/logs-show.h
 
-if ENABLE_MANPAGES
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
@@ -700,6 +699,7 @@ man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 
+if ENABLE_MANPAGES
 dist_man_MANS = \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS)
@@ -724,7 +724,6 @@ EXTRA_DIST += \
 	$(XML_IN_FILES) \
 	${nodist_man_MANS:=.in} \
 	${XML_IN_FILES:.xml.in=.html.in}
-
 endif
 
 systemd_SOURCES = \
@@ -1135,7 +1134,6 @@ lib_LTLIBRARIES += \
 pkgconfiglib_DATA += \
 	src/libsystemd-daemon.pc
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd-daemon.7 \
 	man/sd_notify.3 \
@@ -1155,7 +1153,6 @@ man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
-endif
 
 EXTRA_DIST += \
 	src/libsystemd-daemon.pc.in \
@@ -1471,10 +1468,8 @@ binfmt-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	binfmt-install-data-hook
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/binfmt.d.5
-endif
 
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
@@ -1504,10 +1499,8 @@ vconsole-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	vconsole-install-data-hook
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/vconsole.conf.5
-endif
 
 EXTRA_DIST += \
 	units/systemd-vconsole-setup.service.in
@@ -1560,12 +1553,10 @@ EXTRA_DIST += \
 	units/systemd-readahead-replay.service.in \
 	units/systemd-readahead-done.service.in
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd_readahead.3 \
 	man/sd-readahead.7
 endif
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
@@ -2056,7 +2047,6 @@ dist_udevrules_DATA += \
 nodist_udevrules_DATA += \
 	src/login/73-seat-late.rules
 
-if ENABLE_MANPAGES
 MANPAGES += \
 	man/systemd-logind.conf.5 \
 	man/sd-login.7 \
@@ -2098,7 +2088,6 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
-endif
 
 EXTRA_DIST += \
 	src/login/logind-gperf.gperf \