Skip to content

Commit 57727e7

Browse files
committed
rpm: use specific macros for shell completion paths
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent e1ccc34 commit 57727e7

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

share/rpm/environment-modules.spec.in

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
22
%global vimdatadir %{_datadir}/vim/vimfiles
3+
%global bash_completions_dir %{_datadir}/bash-completion/completions
4+
%global fish_completions_dir %{_datadir}/fish/vendor_completions.d
5+
%global zsh_completions_dir %{_datadir}/zsh/site-functions
36

47
Name: environment-modules
58
Version: 5.5.0
@@ -102,9 +105,9 @@ have access to the module alias.
102105
--mandir=%{_mandir} \
103106
--vimdatadir=%{vimdatadir} \
104107
--nagelfardatadir=%{_datadir}/Modules/nagelfar \
105-
--with-bashcompletiondir=%{_datadir}/bash-completion/completions \
106-
--with-fishcompletiondir=%{_datadir}/fish/vendor_completions.d \
107-
--with-zshcompletiondir=%{_datadir}/zsh/site-functions \
108+
--with-bashcompletiondir=%{bash_completions_dir} \
109+
--with-fishcompletiondir=%{fish_completions_dir} \
110+
--with-zshcompletiondir=%{zsh_completions_dir} \
108111
--enable-multilib-support \
109112
--disable-doc-install \
110113
--enable-modulespath \
@@ -220,13 +223,13 @@ fi
220223
%dir %{_datadir}/Modules/init
221224
%{_datadir}/Modules/init/*
222225
# do not need to require shell package as we "own" completion dir
223-
%dir %{_datadir}/bash-completion/completions
224-
%{_datadir}/bash-completion/completions/module
225-
%{_datadir}/bash-completion/completions/ml
226-
%dir %{_datadir}/zsh/site-functions
227-
%{_datadir}/zsh/site-functions/_module
228-
%dir %{_datadir}/fish/vendor_completions.d
229-
%{_datadir}/fish/vendor_completions.d/module.fish
226+
%dir %{bash_completions_dir}
227+
%{bash_completions_dir}/module
228+
%{bash_completions_dir}/ml
229+
%dir %{zsh_completions_dir}
230+
%{zsh_completions_dir}/_module
231+
%dir %{fish_completions_dir}
232+
%{fish_completions_dir}/module.fish
230233
%dir %{_sysconfdir}/%{name}
231234
%config(noreplace) %{_sysconfdir}/%{name}/initrc
232235
%config(noreplace) %{_sysconfdir}/%{name}/modulespath

0 commit comments

Comments
 (0)