From 0bac0c67e88148478a47631398442866c1fece3f Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Wed, 3 Oct 2018 13:22:45 +0200 Subject: configure.ac: set sysconfdir only if none was specified manually Fixes #2125 --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1efa588a5..a7ef3a392 100755 --- a/configure +++ b/configure @@ -3832,7 +3832,7 @@ fi # set sysconfdir if test "$prefix" = /usr; then - sysconfdir="/etc" + test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" fi 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) # set sysconfdir if test "$prefix" = /usr; then - sysconfdir="/etc" + test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc" fi AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ -- cgit v1.2.3-54-g00ecf