Skip to content

Commit ffd3b65

Browse files
committed
build: replace _SYSCONFDIR_ with @sysconfdir@
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 a37ffc3 ("Add first version of zsh completion", 2021-01-02) / PR netblue30#3864.
1 parent 8b60da9 commit ffd3b65

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/bash_completion/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ all: firejail.bash_completion
1010

1111
firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk
1212
$(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
13-
sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@
13+
sed "s|@sysconfdir@|$(sysconfdir)|" < $@.tmp > $@
1414
$(RM) $@.tmp
1515

1616
.PHONY: clean

src/bash_completion/firejail.bash_completion.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ _profiles() {
1515
fi
1616
}
1717
_all_profiles() {
18-
local sys_profiles=$(_profiles _SYSCONFDIR_/firejail)
18+
local sys_profiles=$(_profiles @sysconfdir@/firejail)
1919
local user_profiles=$(_profiles $HOME/.config/firejail)
2020
COMPREPLY=($(compgen -W "${sys_profiles} ${user_profiles}" -- "$cur"))
2121
}

src/zsh_completion/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ all: _firejail
1010

1111
_firejail: _firejail.in $(ROOT)/config.mk
1212
$(GAWK) -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp
13-
sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@
13+
sed "s|@sysconfdir@|$(sysconfdir)|" < $@.tmp > $@
1414
$(RM) $@.tmp
1515

1616
.PHONY: clean

src/zsh_completion/_firejail.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ _profiles_with_ext() {
2626
}
2727

2828
_all_profiles() {
29-
_values 'profiles' $(_profiles _SYSCONFDIR_/firejail) $(_profiles $HOME/.config/firejail) $(_profiles_with_ext .)
29+
_values 'profiles' $(_profiles @sysconfdir@/firejail) $(_profiles $HOME/.config/firejail) $(_profiles_with_ext .)
3030
}
3131

3232
_session_bus_names() {

0 commit comments

Comments
 (0)