From 7976cee6e5f0f35727f1e6ee7bac4e505283031c Mon Sep 17 00:00:00 2001 From: rusty-snake <41237666+rusty-snake@users.noreply.github.com> Date: Tue, 6 Oct 2020 12:48:33 +0200 Subject: Revert "install vim files to addons directory instead of vimfiles" This reverts commit 4422ce65a9d1e903e583d0f2eca9dc1ee7c839e9. ------ Revert for now as it breaks on some distros (namely Fedora), see https://github.com/netblue30/firejail/commit/4422ce65a9d1e903e583d0f2eca9dc1ee7c839e9#commitcomment-42999952 --- Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index f0760ad75..fd427dc00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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/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 + 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 endif # documents install -m 0755 -d $(DESTDIR)$(DOCDIR) -- cgit v1.2.3-54-g00ecf