Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Tedd Ho-Jeong An <hj.tedd.an@gmail.com>
To:     linux-bluetooth@vger.kernel.org
Subject: [BlueZ PATCH v3 1/4] build: Fix manpage enable flag
Date:   Mon,  3 May 2021 22:02:04 -0700
Message-Id: <20210504050207.841261-2-hj.tedd.an@gmail.com>
In-Reply-To: <20210504050207.841261-1-hj.tedd.an@gmail.com>
References: <20210504050207.841261-1-hj.tedd.an@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Tedd Ho-Jeong An <tedd.an@intel.com>

This patch fixes the manpages installation with --enable-manpages option
so the manpages are not installed by default if the option is not set
during the configuration.
---
 Makefile.am    | 19 ++++++++-----------
 Makefile.tools | 33 ++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2a222167f..cb0d5fc0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,6 @@ bin_PROGRAMS =
 
 noinst_PROGRAMS =
 
-dist_man_MANS =
-
-dist_noinst_MANS =
-
 CLEANFILES =
 
 EXTRA_DIST =
@@ -60,6 +56,10 @@ else
 build_plugindir = $(plugindir)
 endif
 
+if MANPAGES
+man_MANS =
+endif
+manual_pages =
 
 plugin_LTLIBRARIES =
 
@@ -342,7 +342,10 @@ nodist_src_bluetoothd_SOURCES = $(builtin_files)
 
 CLEANFILES += $(builtin_files) src/bluetooth.service
 
-man_MANS = src/bluetoothd.8
+if MANPAGES
+man_MANS += src/bluetoothd.8
+endif
+EXTRA_DIST += src/bluetoothd.8
 
 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
 			src/main.conf profiles/network/network.conf \
@@ -591,12 +594,6 @@ if LIBRARY
 pkgconfig_DATA = lib/bluez.pc
 endif
 
-manual_pages = doc/btmon.1
-
-if MANPAGES
-dist_noinst_MANS += $(manual_pages)
-endif
-
 EXTRA_DIST += $(manual_pages:.1=.txt)
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \
diff --git a/Makefile.tools b/Makefile.tools
index 57e858290..160272212 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -49,7 +49,12 @@ monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
 				monitor/tty.h
 monitor_btmon_LDADD = lib/libbluetooth-internal.la \
 				src/libshared-mainloop.la $(UDEV_LIBS) -ldl
+
+if MANPAGES
+man_MANS += doc/btmon.1
+endif
 endif
+manual_pages += doc/btmon.1
 
 if LOGGER
 pkglibexec_PROGRAMS += tools/btmon-logger
@@ -292,9 +297,9 @@ tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la
 profiles_iap_iapd_SOURCES = profiles/iap/main.c
 profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS)
 
-dist_man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1
-
-EXTRA_DIST += tools/bdaddr.1
+if MANPAGES
+man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1
+endif
 
 if MESH
 bin_PROGRAMS += tools/meshctl
@@ -400,17 +405,18 @@ tools_hcidump_LDADD = lib/libbluetooth-internal.la
 
 tools_rfcomm_LDADD = lib/libbluetooth-internal.la
 
-dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
-			tools/hcitool.1 tools/hcidump.1 \
-			tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
-else
-EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 \
+if MANPAGES
+man_MANS += tools/hciattach.1 tools/hciconfig.1 \
 			tools/hcitool.1 tools/hcidump.1 \
 			tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1
 endif
-else
-EXTRA_DIST += tools/rctest.1 tools/l2ping.1 tools/btattach.1
 endif
+endif
+EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 \
+			tools/hcitool.1 tools/hcidump.1 \
+			tools/rfcomm.1 tools/sdptool.1 tools/ciptool.1 \
+			tools/rctest.1 tools/l2ping.1 tools/btattach.1 \
+			tools/bdaddr.1
 
 if HID2HCI
 udevdir = $(UDEV_DIR)
@@ -419,10 +425,11 @@ udev_PROGRAMS = tools/hid2hci
 
 tools_hid2hci_LDADD = $(UDEV_LIBS)
 
-dist_man_MANS += tools/hid2hci.1
-else
-EXTRA_DIST += tools/hid2hci.1
+if MANPAGES
+man_MANS += tools/hid2hci.1
+endif
 endif
+EXTRA_DIST += tools/hid2hci.1
 
 if READLINE
 noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \
-- 
2.26.3