From d698cd9adbe88a3c4262bf54cd0d09f41ca3c28d Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Mon, 30 Dec 2024 15:02:11 -0800
Subject: [PATCH] man: move all man pages to one directory

Problem: man pages are co-located with source code, which is a
bit awkward when making project-wide changes to documentation.

Move all man pages to a top-level man/ directory.
---
 Makefile.am                       |  1 +
 configure.ac                      | 19 ++++++++++---------
 diod/Makefile.am                  |  3 ---
 etc/Makefile.am                   |  3 ---
 man/Makefile.am                   | 15 +++++++++++++++
 {diod => man}/diod.8.in           |  0
 {etc => man}/diod.conf.5.in       |  0
 {utils => man}/diodcat.8.in       |  0
 {utils => man}/dioddate.8.in      |  0
 {utils => man}/diodload.8.in      |  0
 {utils => man}/diodls.8.in        |  0
 {utils => man}/diodmount.8.in     |  0
 {utils => man}/diodshowmount.8.in |  0
 {utils => man}/dtop.8.in          |  0
 utils/Makefile.am                 | 12 ------------
 15 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 man/Makefile.am
 rename {diod => man}/diod.8.in (100%)
 rename {etc => man}/diod.conf.5.in (100%)
 rename {utils => man}/diodcat.8.in (100%)
 rename {utils => man}/dioddate.8.in (100%)
 rename {utils => man}/diodload.8.in (100%)
 rename {utils => man}/diodls.8.in (100%)
 rename {utils => man}/diodmount.8.in (100%)
 rename {utils => man}/diodshowmount.8.in (100%)
 rename {utils => man}/dtop.8.in (100%)

diff --git a/Makefile.am b/Makefile.am
index b63046a1..b9c3640b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = \
 	libdiod \
 	diod \
 	utils \
+	man \
 	etc
 
 if ENABLE_TESTS
diff --git a/configure.ac b/configure.ac
index 7f5798e5..763ce6c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,15 +221,16 @@ AC_CONFIG_FILES( \
   liblsd/Makefile \
   libnpfs/Makefile \
   libnpclient/Makefile \
-  diod/diod.8 \
-  utils/diodmount.8 \
-  utils/diodcat.8 \
-  utils/dtop.8 \
-  utils/diodload.8 \
-  utils/diodls.8 \
-  utils/diodshowmount.8 \
-  utils/dioddate.8 \
-  etc/diod.conf.5 \
+  man/Makefile \
+  man/diod.8 \
+  man/diodmount.8 \
+  man/diodcat.8 \
+  man/dtop.8 \
+  man/diodload.8 \
+  man/diodls.8 \
+  man/diodshowmount.8 \
+  man/dioddate.8 \
+  man/diod.conf.5 \
   etc/diod.service \
   etc/auto.diod \
   diod/Makefile \
diff --git a/diod/Makefile.am b/diod/Makefile.am
index 1c9db267..79a9a0ab 100644
--- a/diod/Makefile.am
+++ b/diod/Makefile.am
@@ -28,6 +28,3 @@ diod_SOURCES = \
 	fid.h \
 	xattr.c \
 	xattr.h
-
-man8_MANS = \
-        diod.8
diff --git a/etc/Makefile.am b/etc/Makefile.am
index e144cef7..77f6bd98 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,9 +1,6 @@
 systemdsystemunit_DATA = \
 	diod.service
 
-man5_MANS = \
-	diod.conf.5
-
 sysconf_DATA = \
 	diod.conf \
 	auto.diod
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 00000000..a4094b63
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,15 @@
+man5_MANS = \
+	diod.conf.5
+
+man8_MANS = \
+	diod.8 \
+	diodcat.8 \
+	dioddate.8 \
+	diodload.8 \
+	diodls.8 \
+	diodshowmount.8 \
+	dtop.8
+
+if ENABLE_DIODMOUNT
+man8_MANS += diodmount.8
+endif
diff --git a/diod/diod.8.in b/man/diod.8.in
similarity index 100%
rename from diod/diod.8.in
rename to man/diod.8.in
diff --git a/etc/diod.conf.5.in b/man/diod.conf.5.in
similarity index 100%
rename from etc/diod.conf.5.in
rename to man/diod.conf.5.in
diff --git a/utils/diodcat.8.in b/man/diodcat.8.in
similarity index 100%
rename from utils/diodcat.8.in
rename to man/diodcat.8.in
diff --git a/utils/dioddate.8.in b/man/dioddate.8.in
similarity index 100%
rename from utils/dioddate.8.in
rename to man/dioddate.8.in
diff --git a/utils/diodload.8.in b/man/diodload.8.in
similarity index 100%
rename from utils/diodload.8.in
rename to man/diodload.8.in
diff --git a/utils/diodls.8.in b/man/diodls.8.in
similarity index 100%
rename from utils/diodls.8.in
rename to man/diodls.8.in
diff --git a/utils/diodmount.8.in b/man/diodmount.8.in
similarity index 100%
rename from utils/diodmount.8.in
rename to man/diodmount.8.in
diff --git a/utils/diodshowmount.8.in b/man/diodshowmount.8.in
similarity index 100%
rename from utils/diodshowmount.8.in
rename to man/diodshowmount.8.in
diff --git a/utils/dtop.8.in b/man/dtop.8.in
similarity index 100%
rename from utils/dtop.8.in
rename to man/dtop.8.in
diff --git a/utils/Makefile.am b/utils/Makefile.am
index e3851210..ec6b5d8c 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -46,15 +46,3 @@ diodshowmount_SOURCES = diodshowmount.c $(common_sources)
 
 dioddate_LDADD = $(common_ldadd)
 dioddate_SOURCES = dioddate.c $(common_sources)
-
-man8_MANS = \
-	diodcat.8 \
-	dtop.8 \
-	diodload.8 \
-	diodls.8 \
-	diodshowmount.8 \
-	dioddate.8
-
-if ENABLE_DIODMOUNT
-man8_MANS += diodmount.8
-endif