Skip to content

Commit

Permalink
install vim files to addons directory instead of vimfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@reinerh
reinerh committed Oct 5, 2020
1 parent a3bfb5a commit 4422ce6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes)
# contrib scripts
install -m 0755 -t $(DESTDIR)$(libdir)/firejail contrib/*.py contrib/*.sh
# vim syntax
install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
install -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/addons/ftdetect
install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/addons/syntax
install -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/addons/ftdetect
install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/addons/syntax
endif
# documents
install -m 0755 -d $(DESTDIR)$(DOCDIR)
Expand Down

4 comments on commit 4422ce6

@rusty-snake
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Objection: This break for Fedora.

$ rpm -E "%vimfiles_root"
/usr/share/vim/vimfiles

@reinerh
Copy link
Collaborator Author

@reinerh reinerh commented on 4422ce6 Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The directory also exists in Debian, but addons are supposed to go to /usr/share/vim/addons. Does this not exist in Fedora?

@rusty-snake
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Files in /usr/share/vim/addons are ignored by the default-config. This is what it looks like to me.

@reinerh
Copy link
Collaborator Author

@reinerh reinerh commented on 4422ce6 Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, please feel free to revert it. (Otherwise I'll do it in the evening)
In Debian I'm installing the files differently anyway.

Please sign in to comment.