autoconf: use include directives instead of recursing down man

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316

diff --git a/Makefile.am b/Makefile.am
index 5144395841886de2838c287aadba143719d1a943..89f258a1d83c9bc125693f1c1f6840a27be70cda 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,11 @@ endif
 
 CPPCHECKDIRS += etc/systemd/system-generators
 if CONFIG_USER
-SUBDIRS += . man tests etc contrib
-include $(srcdir)/%D%/scripts/Makefile.am
-include $(srcdir)/%D%/lib/Makefile.am
+SUBDIRS += . tests etc contrib
 include $(srcdir)/%D%/cmd/Makefile.am
+include $(srcdir)/%D%/lib/Makefile.am
+include $(srcdir)/%D%/man/Makefile.am
+include $(srcdir)/%D%/scripts/Makefile.am
 if BUILD_LINUX
 SUBDIRS += udev
 endif
@@ -129,7 +130,7 @@ SHELLCHECKSCRIPTS += autogen.sh
 
 PHONY += mancheck
 mancheck:
-       ${top_srcdir}/scripts/mancheck.sh ${top_srcdir}/man ${top_srcdir}/tests/test-runner/man
+       $(top_srcdir)/scripts/mancheck.sh $(top_srcdir)/man $(top_srcdir)/tests/test-runner/man
 
 PHONY += testscheck
 testscheck:

diff --git a/configure.ac b/configure.ac
index 9078f5c1a5a4522f0861d91dc7382070dce81758..42f6fa6198287c4ba93b39f904ecff2275fcce17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,6 @@ AC_CONFIG_FILES([
        lib/libzfs/libzfs.pc
        lib/libzfsbootenv/libzfsbootenv.pc
        lib/libzfs_core/libzfs_core.pc
-       man/Makefile
        module/Kbuild
        module/Makefile
        rpm/Makefile

diff --git a/man/Makefile.am b/man/Makefile.am
index e58683739e726777720500eba023a3ef1f353a1d..86e23c58f116d407d41ea12bd6aee820faf4d69d 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,112 +1,108 @@
-CLEANFILES =
-EXTRA_DIST =
-include $(top_srcdir)/config/Substfiles.am
-
 EXTRA_DIST += \
-       man1/cstyle.1
+       %D%/man1/cstyle.1
 
 dist_man_MANS = \
-       man1/zhack.1 \
-       man1/ztest.1 \
-       man1/raidz_test.1 \
-       man1/zvol_wait.1 \
-       man1/arcstat.1 \
+       %D%/man1/arcstat.1 \
+       %D%/man1/raidz_test.1 \
+       %D%/man1/zhack.1 \
+       %D%/man1/ztest.1 \
+       %D%/man1/zvol_wait.1 \
        \
-       man5/vdev_id.conf.5 \
+       %D%/man5/vdev_id.conf.5 \
        \
-       man4/spl.4 \
-       man4/zfs.4 \
+       %D%/man4/spl.4 \
+       %D%/man4/zfs.4 \
        \
-       man7/dracut.zfs.7 \
-       man7/zpool-features.7 \
-       man7/zfsconcepts.7 \
-       man7/zfsprops.7 \
-       man7/zpoolconcepts.7 \
-       man7/zpoolprops.7 \
+       %D%/man7/dracut.zfs.7 \
+       %D%/man7/zfsconcepts.7 \
+       %D%/man7/zfsprops.7 \
+       %D%/man7/zpool-features.7 \
+       %D%/man7/zpoolconcepts.7 \
+       %D%/man7/zpoolprops.7 \
        \
-       man8/fsck.zfs.8 \
-       man8/mount.zfs.8 \
-       man8/vdev_id.8 \
-       man8/zdb.8 \
-       man8/zfs.8 \
-       man8/zfs-allow.8 \
-       man8/zfs-bookmark.8 \
-       man8/zfs-change-key.8 \
-       man8/zfs-clone.8 \
-       man8/zfs-create.8 \
-       man8/zfs-destroy.8 \
-       man8/zfs-diff.8 \
-       man8/zfs-get.8 \
-       man8/zfs-groupspace.8 \
-       man8/zfs-hold.8 \
-       man8/zfs-inherit.8 \
-       man8/zfs-jail.8 \
-       man8/zfs-list.8 \
-       man8/zfs-load-key.8 \
-       man8/zfs-mount.8 \
-       man8/zfs-program.8 \
-       man8/zfs-project.8 \
-       man8/zfs-projectspace.8 \
-       man8/zfs-promote.8 \
-       man8/zfs-receive.8 \
-       man8/zfs-recv.8 \
-       man8/zfs-redact.8 \
-       man8/zfs-release.8 \
-       man8/zfs-rename.8 \
-       man8/zfs-rollback.8 \
-       man8/zfs-send.8 \
-       man8/zfs-set.8 \
-       man8/zfs-share.8 \
-       man8/zfs-snapshot.8 \
-       man8/zfs-unallow.8 \
-       man8/zfs-unjail.8 \
-       man8/zfs-unload-key.8 \
-       man8/zfs-unmount.8 \
-       man8/zfs-upgrade.8 \
-       man8/zfs-userspace.8 \
-       man8/zfs-wait.8 \
-       man8/zfs_ids_to_path.8 \
-       man8/zgenhostid.8 \
-       man8/zinject.8 \
-       man8/zpool.8 \
-       man8/zpool-add.8 \
-       man8/zpool-attach.8 \
-       man8/zpool-checkpoint.8 \
-       man8/zpool-clear.8 \
-       man8/zpool-create.8 \
-       man8/zpool-destroy.8 \
-       man8/zpool-detach.8 \
-       man8/zpool-events.8 \
-       man8/zpool-export.8 \
-       man8/zpool-get.8 \
-       man8/zpool-history.8 \
-       man8/zpool-import.8 \
-       man8/zpool-initialize.8 \
-       man8/zpool-iostat.8 \
-       man8/zpool-labelclear.8 \
-       man8/zpool-list.8 \
-       man8/zpool-offline.8 \
-       man8/zpool-online.8 \
-       man8/zpool-reguid.8 \
-       man8/zpool-remove.8 \
-       man8/zpool-reopen.8 \
-       man8/zpool-replace.8 \
-       man8/zpool-resilver.8 \
-       man8/zpool-scrub.8 \
-       man8/zpool-set.8 \
-       man8/zpool-split.8 \
-       man8/zpool-status.8 \
-       man8/zpool-sync.8 \
-       man8/zpool-trim.8 \
-       man8/zpool-upgrade.8 \
-       man8/zpool-wait.8 \
-       man8/zstream.8 \
-       man8/zstreamdump.8 \
-       man8/zpool_influxdb.8
+       %D%/man8/fsck.zfs.8 \
+       %D%/man8/mount.zfs.8 \
+       %D%/man8/vdev_id.8 \
+       %D%/man8/zdb.8 \
+       %D%/man8/zfs.8 \
+       %D%/man8/zfs-allow.8 \
+       %D%/man8/zfs-bookmark.8 \
+       %D%/man8/zfs-change-key.8 \
+       %D%/man8/zfs-clone.8 \
+       %D%/man8/zfs-create.8 \
+       %D%/man8/zfs-destroy.8 \
+       %D%/man8/zfs-diff.8 \
+       %D%/man8/zfs-get.8 \
+       %D%/man8/zfs-groupspace.8 \
+       %D%/man8/zfs-hold.8 \
+       %D%/man8/zfs-inherit.8 \
+       %D%/man8/zfs-jail.8 \
+       %D%/man8/zfs-list.8 \
+       %D%/man8/zfs-load-key.8 \
+       %D%/man8/zfs-mount.8 \
+       %D%/man8/zfs-program.8 \
+       %D%/man8/zfs-project.8 \
+       %D%/man8/zfs-projectspace.8 \
+       %D%/man8/zfs-promote.8 \
+       %D%/man8/zfs-receive.8 \
+       %D%/man8/zfs-recv.8 \
+       %D%/man8/zfs-redact.8 \
+       %D%/man8/zfs-release.8 \
+       %D%/man8/zfs-rename.8 \
+       %D%/man8/zfs-rollback.8 \
+       %D%/man8/zfs-send.8 \
+       %D%/man8/zfs-set.8 \
+       %D%/man8/zfs-share.8 \
+       %D%/man8/zfs-snapshot.8 \
+       %D%/man8/zfs-unallow.8 \
+       %D%/man8/zfs-unjail.8 \
+       %D%/man8/zfs-unload-key.8 \
+       %D%/man8/zfs-unmount.8 \
+       %D%/man8/zfs-upgrade.8 \
+       %D%/man8/zfs-userspace.8 \
+       %D%/man8/zfs-wait.8 \
+       %D%/man8/zfs_ids_to_path.8 \
+       %D%/man8/zgenhostid.8 \
+       %D%/man8/zinject.8 \
+       %D%/man8/zpool.8 \
+       %D%/man8/zpool-add.8 \
+       %D%/man8/zpool-attach.8 \
+       %D%/man8/zpool-checkpoint.8 \
+       %D%/man8/zpool-clear.8 \
+       %D%/man8/zpool-create.8 \
+       %D%/man8/zpool-destroy.8 \
+       %D%/man8/zpool-detach.8 \
+       %D%/man8/zpool-events.8 \
+       %D%/man8/zpool-export.8 \
+       %D%/man8/zpool-get.8 \
+       %D%/man8/zpool-history.8 \
+       %D%/man8/zpool-import.8 \
+       %D%/man8/zpool-initialize.8 \
+       %D%/man8/zpool-iostat.8 \
+       %D%/man8/zpool-labelclear.8 \
+       %D%/man8/zpool-list.8 \
+       %D%/man8/zpool-offline.8 \
+       %D%/man8/zpool-online.8 \
+       %D%/man8/zpool-reguid.8 \
+       %D%/man8/zpool-remove.8 \
+       %D%/man8/zpool-reopen.8 \
+       %D%/man8/zpool-replace.8 \
+       %D%/man8/zpool-resilver.8 \
+       %D%/man8/zpool-scrub.8 \
+       %D%/man8/zpool-set.8 \
+       %D%/man8/zpool-split.8 \
+       %D%/man8/zpool-status.8 \
+       %D%/man8/zpool-sync.8 \
+       %D%/man8/zpool-trim.8 \
+       %D%/man8/zpool-upgrade.8 \
+       %D%/man8/zpool-wait.8 \
+       %D%/man8/zstream.8 \
+       %D%/man8/zstreamdump.8 \
+       %D%/man8/zpool_influxdb.8
 
 nodist_man_MANS = \
-       man8/zed.8 \
-       man8/zfs-mount-generator.8
+       %D%/man8/zed.8 \
+       %D%/man8/zfs-mount-generator.8
 
 SUBSTFILES += $(nodist_man_MANS)
 
@@ -115,6 +111,7 @@ if BUILD_LINUX
 # The manual pager in most Linux distros defaults to "BSD" when .Os is blank,
 # but leaving it blank makes things a lot easier on
 # FreeBSD when OpenZFS is vendored in the base system.
-install-data-hook:
-       cd $(DESTDIR)$(mandir) && $(SED) ${ac_inplace} -e 's/^\.Os$$/.Os OpenZFS/' $(dist_man_MANS) $(nodist_man_MANS)
+INSTALL_DATA_HOOKS += man-install-data-hook
+man-install-data-hook:
+       cd $(DESTDIR)$(mandir) && $(SED) $(ac_inplace) 's/^\.Os$$/.Os OpenZFS/' $(subst %D%/,,$(dist_man_MANS) $(nodist_man_MANS))
 endif

diff --git a/tests/test-runner/man/Makefile.am b/tests/test-runner/man/Makefile.am
index a7017f5f05358f61c96684d027c3d39241afd07a..503a5694f4536e3f4dff02fac965e838f7dc8fa5 100644 (file)
--- a/tests/test-runner/man/Makefile.am
+++ b/tests/test-runner/man/Makefile.am
@@ -1,4 +1 @@
 dist_man_MANS = test-runner.1
-
-install-data-local:
-       $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man1"