From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 15 Mar 2003 05:21:43 +0000 (+0000)
Subject: back out rev 1.352
X-Git-Tag: SUDO_1_6_7~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18f3cfdf6d7ebb56e8008d80a20f72ea06a6d58c;p=sudo

back out rev 1.352
---

diff --git a/configure.in b/configure.in
index 88fc0c3cb..18c40e719 100644
--- a/configure.in
+++ b/configure.in
@@ -105,23 +105,12 @@ CHECKSHADOW=true
 CHECKSIA=true
 
 dnl
-dnl Fix up some Makefile ugliness
+dnl Override default configure dirs...
 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'
-
-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
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
 
 dnl
 dnl Deprecated --with options (these all warn or generate an error)