Skip to content

Commit bce3829

Browse files
committed
rpm: use vimfiles_root macro provided by vim-filesystem
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 4c73223 commit bce3829

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

share/rpm/environment-modules.spec.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
2-
%global vimdatadir %{_datadir}/vim/vimfiles
32
%if 0%{?rhel} && 0%{?rhel} <= 9
43
%global bash_completions_dir %{_datadir}/bash-completion/completions
54
%global fish_completions_dir %{_datadir}/fish/vendor_completions.d
@@ -111,7 +110,7 @@ have access to the module alias.
111110
--bindir=%{_datadir}/Modules/bin \
112111
--libexecdir=%{_datadir}/Modules/libexec \
113112
--mandir=%{_mandir} \
114-
--vimdatadir=%{vimdatadir} \
113+
--vimdatadir=%{vimfiles_root} \
115114
--emacsdatadir=%{_emacs_sitelispdir}/%{name} \
116115
--nagelfardatadir=%{_datadir}/Modules/nagelfar \
117116
--with-bashcompletiondir=%{bash_completions_dir} \
@@ -256,9 +255,9 @@ fi
256255
%{_mandir}/man1/module.1.gz
257256
%{_mandir}/man5/modulefile.5.gz
258257
%{macrosdir}/macros.%{name}
259-
%{vimdatadir}/ftdetect/modulefile.vim
260-
%{vimdatadir}/ftplugin/modulefile.vim
261-
%{vimdatadir}/syntax/modulefile.vim
258+
%{vimfiles_root}/ftdetect/modulefile.vim
259+
%{vimfiles_root}/ftplugin/modulefile.vim
260+
%{vimfiles_root}/syntax/modulefile.vim
262261
%dir %{_emacs_sitelispdir}/%{name}
263262
%{_emacs_sitelispdir}/%{name}/*
264263
%{_emacs_sitestartdir}/%{name}-init.el

0 commit comments

Comments
 (0)