diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2018-10-03 13:22:45 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2018-10-03 13:25:47 +0200 |
commit | 0bac0c67e88148478a47631398442866c1fece3f (patch) | |
tree | ea263dd4a86e6126707ea0d6706e0cea18816b06 | |
parent | Fixes #2048 (diff) | |
download | firejail-0bac0c67e88148478a47631398442866c1fece3f.tar.gz firejail-0bac0c67e88148478a47631398442866c1fece3f.tar.zst firejail-0bac0c67e88148478a47631398442866c1fece3f.zip |
configure.ac: set sysconfdir only if none was specified manually
Fixes #2125
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -3832,7 +3832,7 @@ fi | |||
3832 | 3832 | ||
3833 | # set sysconfdir | 3833 | # set sysconfdir |
3834 | if test "$prefix" = /usr; then | 3834 | if test "$prefix" = /usr; then |
3835 | sysconfdir="/etc" | 3835 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" |
3836 | fi | 3836 | fi |
3837 | 3837 | ||
3838 | ac_config_files="$ac_config_files Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile" | 3838 | ac_config_files="$ac_config_files Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile" |
diff --git a/configure.ac b/configure.ac index f01bf2199..d1b827fef 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -183,7 +183,7 @@ AC_SUBST(HAVE_SECCOMP_H) | |||
183 | 183 | ||
184 | # set sysconfdir | 184 | # set sysconfdir |
185 | if test "$prefix" = /usr; then | 185 | if test "$prefix" = /usr; then |
186 | sysconfdir="/etc" | 186 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" |
187 | fi | 187 | fi |
188 | 188 | ||
189 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ | 189 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ |