Don't set sysconfdir to '/etc' if the user has specified a --prefix.

diff --git a/configure.in b/configure.in
index 3ba8b2c38779261f5dac8d01fe126a79d133e017..efe3f05400e03374f6fdf6405cfdebe2c026f3d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -105,12 +105,23 @@ CHECKSHADOW=true
 CHECKSIA=true
 
 dnl
-dnl Override default configure dirs...
+dnl Fix up some Makefile ugliness
 dnl
 test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
 test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
 test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+
+dnl
+dnl Sudoers should go in /etc unless either prefix or sysconfdir have been
+dnl explicitly specified by the user.
+dnl
+if test "$sysconfdir" = '${prefix}/etc'; then
+    if test "$prefix" = "NONE"; then
+       sysconfdir='/etc'
+    else
+       sysconfdir='$(prefix)/etc'
+    fi
+fi
 
 dnl
 dnl Deprecated --with options (these all warn or generate an error)