diff options
author | Arvind Sankar <[email protected]> | 2020-06-25 14:14:54 -0400 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2020-06-26 14:20:02 -0700 |
commit | 6b99fc0620f00fcfd201595b2bc6d279031dcb09 (patch) | |
tree | cc5149529e1148acaae62dc46b47b39c5090439e /man | |
parent | 7c902a5178496f1321ecb9f33df743a77278089e (diff) |
Fixes for make dist
Reduce the usage of EXTRA_DIST. If files are conditionally included in
_SOURCES, _HEADERS etc, automake is smart enough to dist all files that
could possibly be included, but this does not apply to EXTRA_DIST,
resulting in make dist depending on the configuration.
Add some files that were missing altogether in various Makefile's.
The changes to disted files in this commit (excluding deleted files):
+./cmd/zed/agents/README.md
+./etc/init.d/README.md
+./lib/libspl/os/freebsd/getexecname.c
+./lib/libspl/os/freebsd/gethostid.c
+./lib/libspl/os/freebsd/getmntany.c
+./lib/libspl/os/freebsd/mnttab.c
-./lib/libzfs/libzfs_core.pc
-./lib/libzfs/libzfs.pc
+./lib/libzfs/os/freebsd/libzfs_compat.c
+./lib/libzfs/os/freebsd/libzfs_fsshare.c
+./lib/libzfs/os/freebsd/libzfs_ioctl_compat.c
+./lib/libzfs/os/freebsd/libzfs_zmount.c
+./lib/libzutil/os/freebsd/zutil_compat.c
+./lib/libzutil/os/freebsd/zutil_device_path_os.c
+./lib/libzutil/os/freebsd/zutil_import_os.c
+./module/lua/README.zfs
+./module/os/linux/spl/README.md
+./tests/README.md
+./tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_rm_nested.ksh
+./tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh
+./tests/zfs-tests/tests/functional/inheritance/README.config
+./tests/zfs-tests/tests/functional/inheritance/README.state
+./tests/zfs-tests/tests/functional/rsend/rsend_016_neg.ksh
+./tests/zfs-tests/tests/perf/fio/sequential_readwrite.fio
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10501
Diffstat (limited to 'man')
-rw-r--r-- | man/man1/Makefile.am | 3 | ||||
-rw-r--r-- | man/man5/Makefile.am | 3 | ||||
-rw-r--r-- | man/man8/Makefile.am | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am index de5432861..cbfbcc0f3 100644 --- a/man/man1/Makefile.am +++ b/man/man1/Makefile.am @@ -1,5 +1,2 @@ dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1 EXTRA_DIST = cstyle.1 - -install-data-local: - $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man1" diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index 1c0683ee3..08d04133b 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -4,6 +4,3 @@ dist_man_MANS = \ spl-module-parameters.5 \ zfs-module-parameters.5 \ zfs-events.5 - -install-data-local: - $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man5" diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index 7284ba800..0298961b3 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -97,8 +97,5 @@ $(nodist_man_MANS): %: %.in -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' -install-data-local: - $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8" - CLEANFILES = \ $(nodist_man_MANS) |