automake: in scripts, use sysconfdir as-is

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/src/cclass.in b/src/cclass.in
index 1a2a807371b9a28ec0430c80b26c8550cf53d934..7c615d5207fcdd55e9706ebaabeb06031e0e1044 100755 (executable)
--- 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 eb1cdf099b2a083a54e9e65f50525ad47e46db94..87258840833f1fc9edf41dafc92276182a10c7d3 100644 (file)
--- 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 b1aeef23c323cd2c1cd8e05ee5f62db5f9e0cfbc..cac7c392581f1f0db7a45a38084d8ee5c244cd85 100644 (file)
--- 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() {