From 1e2e4aa0f4864bb3e23dd1023eed2162b1db39d2 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 7 Dec 2010 10:56:05 -0800
Subject: [PATCH] automake: in scripts, use sysconfdir as-is

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---
 src/cclass.in     | 10 ++--------
 src/cdebugpack.in |  7 +------
 src/mkcephfs.in   |  7 +------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/cclass.in b/src/cclass.in
index 1a2a807371b9a..7c615d5207fcd 100755
--- a/src/cclass.in
+++ b/src/cclass.in
@@ -12,14 +12,8 @@ if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
     libdir=$LIBDIR
 else
     BINDIR=@bindir@
-    LIBDIR=@libdir@
-    # i hate autoconf:
-    if [ "@sysconfdir@" = "/usr/etc" ]; then
-	ETCDIR=/etc/ceph
-    else
-	ETCDIR=@sysconfdir@/ceph
-    fi
-    libdir="$LIBDIR/rados-classes"
+    ETCDIR=@sysconfdir@/ceph
+    libdir=@libdir@/rados-classes
 fi
 
 load_opt="changed"
diff --git a/src/cdebugpack.in b/src/cdebugpack.in
index eb1cdf099b2a0..87258840833f1 100644
--- a/src/cdebugpack.in
+++ b/src/cdebugpack.in
@@ -11,12 +11,7 @@ if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
 else
     BINDIR=@bindir@
     LIBDIR=@libdir@/ceph
-    # i hate autoconf:
-    if [ "@sysconfdir@" = "/usr/etc" ]; then
-	ETCDIR=/etc/ceph
-    else
-	ETCDIR=@sysconfdir@/ceph
-    fi
+    ETCDIR=@sysconfdir@/ceph
 fi
 
 BINDBGDIR="/usr/lib/debug/usr/bin"
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index b1aeef23c323c..cac7c392581f1 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -9,12 +9,7 @@ if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
 else
     BINDIR=@bindir@
     LIBDIR=@libdir@/ceph
-    # i hate autoconf:
-    if [ "@sysconfdir@" = "/usr/etc" ]; then
-	ETCDIR=/etc/ceph
-    else
-	ETCDIR=@sysconfdir@/ceph
-    fi
+    ETCDIR=@sysconfdir@/ceph
 fi
 
 usage_exit() {
-- 
2.39.5