Skip to content

Commit

Permalink
man: use one Makefile, use OpenZFS for .Os
Browse files Browse the repository at this point in the history
The prevailing style is to use either nothing, or the originating
organisational umbrella (here: OpenZFS), and these aren't Linux manpages

This also deduplicates the substitution code, and makes adding/removing
sexions simpler in future

Signed-off-by: Ahelenia Ziemiańska <[email protected]>
  • Loading branch information
nabijaczleweli committed Jun 9, 2021
1 parent 08cd071 commit 1357f8c
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 134 deletions.
3 changes: 0 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,6 @@ AC_CONFIG_FILES([
lib/libzstd/Makefile
lib/libzutil/Makefile
man/Makefile
man/man1/Makefile
man/man5/Makefile
man/man8/Makefile
module/Kbuild
module/Makefile
module/avl/Makefile
Expand Down
117 changes: 116 additions & 1 deletion man/Makefile.am
Original file line number Diff line number Diff line change
@@ -1 +1,116 @@
SUBDIRS = man1 man5 man8
include $(top_srcdir)/config/Substfiles.am

EXTRA_DIST += \
man1/cstyle.1

dist_man_MANS = \
man1/zhack.1 \
man1/ztest.1 \
man1/raidz_test.1 \
man1/zvol_wait.1 \
man1/arcstat.1 \
\
man5/vdev_id.conf.5 \
man5/zpool-features.5 \
man5/spl-module-parameters.5 \
man5/zfs-module-parameters.5 \
man5/zfs-events.5 \
\
man8/fsck.zfs.8 \
man8/mount.zfs.8 \
man8/vdev_id.8 \
man8/zdb.8 \
man8/zfs.8 \
man8/zfsconcepts.8 \
man8/zfsprops.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/zpoolconcepts.8 \
man8/zpoolprops.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

nodist_man_MANS = \
man8/zed.8 \
man8/zfs-mount-generator.8

SUBSTFILES += $(nodist_man_MANS)


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)
endif
12 changes: 0 additions & 12 deletions man/man1/Makefile.am

This file was deleted.

16 changes: 0 additions & 16 deletions man/man5/Makefile.am

This file was deleted.

102 changes: 0 additions & 102 deletions man/man8/Makefile.am

This file was deleted.

0 comments on commit 1357f8c

Please sign in to comment.