From 2fa577efd99021e8ab3116d0ab2765d45ed4bb07 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 6 May 2025 09:11:26 +0000 Subject: [PATCH] build: replace _SYSCONFDIR_ with @sysconfdir@ (#6737) For consistency, use the conventional autoconf variable name (see also config.mk.in). Commands used to search and replace: $ git grep -Ilz '_SYSCONFDIR_' | xargs -0 \ perl -pi -e 's/_SYSCONFDIR_/\@sysconfdir\@/' Added on commit a37ffc337 ("Add first version of zsh completion", 2021-01-02) / PR #3864. --- src/bash_completion/Makefile | 2 +- src/bash_completion/firejail.bash_completion.in | 2 +- src/zsh_completion/Makefile | 2 +- src/zsh_completion/_firejail.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile index c06323f64..7a46d608c 100644 --- a/src/bash_completion/Makefile +++ b/src/bash_completion/Makefile @@ -10,7 +10,7 @@ all: firejail.bash_completion firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk $(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp - sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ + sed "s|@sysconfdir@|$(sysconfdir)|" < $@.tmp > $@ $(RM) $@.tmp .PHONY: clean diff --git a/src/bash_completion/firejail.bash_completion.in b/src/bash_completion/firejail.bash_completion.in index 4a1adbc26..95b94bf4c 100644 --- a/src/bash_completion/firejail.bash_completion.in +++ b/src/bash_completion/firejail.bash_completion.in @@ -15,7 +15,7 @@ _profiles() { fi } _all_profiles() { - local sys_profiles=$(_profiles _SYSCONFDIR_/firejail) + local sys_profiles=$(_profiles @sysconfdir@/firejail) local user_profiles=$(_profiles $HOME/.config/firejail) COMPREPLY=($(compgen -W "${sys_profiles} ${user_profiles}" -- "$cur")) } diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile index cbc476a73..24d9dbee4 100644 --- a/src/zsh_completion/Makefile +++ b/src/zsh_completion/Makefile @@ -10,7 +10,7 @@ all: _firejail _firejail: _firejail.in $(ROOT)/config.mk $(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp - sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ + sed "s|@sysconfdir@|$(sysconfdir)|" < $@.tmp > $@ $(RM) $@.tmp .PHONY: clean diff --git a/src/zsh_completion/_firejail.in b/src/zsh_completion/_firejail.in index ff42ca833..1dfe11862 100644 --- a/src/zsh_completion/_firejail.in +++ b/src/zsh_completion/_firejail.in @@ -26,7 +26,7 @@ _profiles_with_ext() { } _all_profiles() { - _values 'profiles' $(_profiles _SYSCONFDIR_/firejail) $(_profiles $HOME/.config/firejail) $(_profiles_with_ext .) + _values 'profiles' $(_profiles @sysconfdir@/firejail) $(_profiles $HOME/.config/firejail) $(_profiles_with_ext .) } _session_bus_names() {