contrib: bash_completion.d: install, fix dist

dist diff: -zfs-2.1.99/contrib/bash_completion.d/zfs install diff: +destdir/usr/local/etc/bash_completion.d +destdir/usr/local/etc/bash_completion.d/zfs Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes openzfs#13316
siv0 · May 10, 2022 · 612b8df · 612b8df
1 parent 0a9aaa7
commit 612b8df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/contrib/bash_completion.d/Makefile.am b/contrib/bash_completion.d/Makefile.am
@@ -1,6 +1,7 @@
-noinst_DATA  = %D%/zfs
-EXTRA_DIST  += $(noinst_DATA)
-SUBSTFILES  += $(noinst_DATA)
+bashcompletiondir = $(sysconfdir)/bash_completion.d
 
-SHELLCHECKSCRIPTS += $(noinst_DATA)
-$(call SHELLCHECK_OPTS,$(noinst_DATA)): SHELLCHECK_SHELL = bash
+nodist_bashcompletion_DATA  = %D%/zfs
+SUBSTFILES                 += $(nodist_bashcompletion_DATA)
+
+SHELLCHECKSCRIPTS   += $(nodist_bashcompletion_DATA)
+$(call SHELLCHECK_OPTS,$(nodist_bashcompletion_DATA)): SHELLCHECK_SHELL = bash
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
@@ -518,6 +518,8 @@ systemctl --system daemon-reload >/dev/null || true
 %config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
 %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
 
+%config(noreplace) %{_sysconfdir}/bash_completion.d/zfs
+
 %files -n libzpool5
 %{_libdir}/libzpool.so.*