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 /cmd/arc_summary | |
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 'cmd/arc_summary')
-rw-r--r-- | cmd/arc_summary/Makefile.am | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/cmd/arc_summary/Makefile.am b/cmd/arc_summary/Makefile.am index e9dbb779a..ee758006e 100644 --- a/cmd/arc_summary/Makefile.am +++ b/cmd/arc_summary/Makefile.am @@ -1,17 +1,14 @@ -EXTRA_DIST = arc_summary2 arc_summary3 - transform = $(program_transform_name) if USING_PYTHON_2 -dist_bin_SCRIPTS = arc_summary2 -install-exec-hook: - before=$$(echo arc_summary2 | sed '$(transform)'); \ - after=$$(echo arc_summary | sed '$(transform)'); \ - mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after" +SCRIPT = arc_summary2 else -dist_bin_SCRIPTS = arc_summary3 +SCRIPT = arc_summary3 +endif + +dist_bin_SCRIPTS = $(SCRIPT) + install-exec-hook: - before=$$(echo arc_summary3 | sed '$(transform)'); \ + before=$$(echo $(SCRIPT) | sed '$(transform)'); \ after=$$(echo arc_summary | sed '$(transform)'); \ mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after" -endif |