diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index f777174d7..a7b7c8a3e 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml @@ -5,7 +5,7 @@ on: branches: [ master ] paths-ignore: - '.github/ISSUE_TEMPLATE/*' - - 'contrib/gtksourceview-5/**' + - 'contrib/syntax/**' - 'contrib/vim/**' - 'etc/**' - 'src/man/*.txt' @@ -27,7 +27,7 @@ on: branches: [ master ] paths-ignore: - '.github/ISSUE_TEMPLATE/*' - - 'contrib/gtksourceview-5/**' + - 'contrib/syntax/**' - 'contrib/vim/**' - 'etc/**' - 'src/man/*.txt' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 115919477..eb9c28345 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -10,7 +10,7 @@ on: branches: [ master ] paths-ignore: - '.github/ISSUE_TEMPLATE/*' - - 'contrib/gtksourceview-5/**' + - 'contrib/syntax/**' - 'contrib/vim/**' - 'etc/**' - 'src/man/*.txt' @@ -32,7 +32,7 @@ on: branches: [ master ] paths-ignore: - '.github/ISSUE_TEMPLATE/*' - - 'contrib/gtksourceview-5/**' + - 'contrib/syntax/**' - 'contrib/vim/**' - 'etc/**' - 'src/man/*.txt' diff --git a/Makefile b/Makefile index 4809b4b7b..45bdf1d57 100644 --- a/Makefile +++ b/Makefile @@ -124,10 +124,10 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes) 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 - # gtksourceview-5 language-specs + install -m 0644 contrib/syntax/files/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax + # gtksourceview language-specs install -m 0755 -d $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs - install -m 0644 contrib/gtksourceview-5/language-specs/firejail-profile.lang $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs + install -m 0644 contrib/syntax/files/firejail-profile.lang $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs endif # documents install -m 0755 -d $(DESTDIR)$(docdir) diff --git a/contrib/gtksourceview-5/language-specs/firejail-profile.lang b/contrib/syntax/files/firejail-profile.lang similarity index 100% rename from contrib/gtksourceview-5/language-specs/firejail-profile.lang rename to contrib/syntax/files/firejail-profile.lang diff --git a/contrib/vim/syntax/firejail.vim b/contrib/syntax/files/firejail.vim similarity index 100% rename from contrib/vim/syntax/firejail.vim rename to contrib/syntax/files/firejail.vim