diff options
| author | Stoiko Ivanov <[email protected]> | 2023-09-20 19:33:14 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2023-10-02 17:05:59 -0700 |
| commit | e69ade32e116e72d03068c03799924c3f1a15c95 (patch) | |
| tree | 68b9cffd40103f213e3b452eb3de5056b0a3f2a4 /contrib | |
| parent | 4e16964e1c1555704f6e7cd031ae32e1491f0b11 (diff) | |
contrib: bash_completion.d: make install destination vendor dependent
Certain Linux distributions (Debian/Ubuntu at least) expect
bash-completion snippets to be installed in
/usr/share/bash-completion/completions instead of
/etc/bash_completion.d.
This patch sets the bashcompletiondir variable based on the vendor,
inspired by similar settings for initdir and initconfdir.
It seems that commit 612b8dff5bc3d827efb864a199a62bda1a419254
caused the file to be installed in the first-place (thus the error
when building debian packages only became apparent when testing a
2.2.0-rc4 build)
The change only sets the variable in Makefile context - the
rpm/zfs.spec.in file has the path hardcoded as
%{_sysconfdir}/bash_completion.d/zfs, but since running
```
./configure --sysconfdir=/myetc ; make rpm
```
also results in all relevant files to be installed in /etc instead of
/myetc I assume this can remain as is.
Reviewed-by: Umer Saleem <[email protected]>
Signed-off-by: Stoiko Ivanov <[email protected]>
Closes #15304
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bash_completion.d/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/bash_completion.d/Makefile.am b/contrib/bash_completion.d/Makefile.am index dc4b610c4..1ec05ed73 100644 --- a/contrib/bash_completion.d/Makefile.am +++ b/contrib/bash_completion.d/Makefile.am @@ -1,5 +1,3 @@ -bashcompletiondir = $(sysconfdir)/bash_completion.d - nodist_bashcompletion_DATA = %D%/zfs SUBSTFILES += $(nodist_bashcompletion_DATA) |