diff options
| author |  startx2017 <vradu.startx@yandex.com> | 2018-10-09 08:38:01 -0400 |
|---|---|---|
| committer | startx2017 <vradu.startx@yandex.com> | 2018-10-09 08:38:01 -0400 |
| commit | 7e2524af851f161016c3b42bcec53b76f196857c (patch) | |
| tree | eae4a15ad9ddb56b39e8a0cbf15240326b626bd2 /configure.ac | |
| parent | mainline merge: tests: skip audit.exp if tests are already running in a pid n... (diff) | |
| download | firejail-7e2524af851f161016c3b42bcec53b76f196857c.tar.gz firejail-7e2524af851f161016c3b42bcec53b76f196857c.tar.zst firejail-7e2524af851f161016c3b42bcec53b76f196857c.zip | |
mainline merge: configure.ac: set sysconfdir only if none was specified manually
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6ff85da21..9e4b72247 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -136,7 +136,7 @@ AC_SUBST(HAVE_SECCOMP_H) | |||
| 136 | 136 | ||
| 137 | # set sysconfdir | 137 | # set sysconfdir |
| 138 | if test "$prefix" = /usr; then | 138 | if test "$prefix" = /usr; then |
| 139 | sysconfdir="/etc" | 139 | test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" |
| 140 | fi | 140 | fi |
| 141 | 141 | ||
| 142 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ | 142 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ |