From 10b6887eaeb13dbf7fc9fe6ca3347da0251aae9e Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 7 Dec 2010 10:48:19 -0800
Subject: [PATCH] automake: in deb pkg, use --syconfdir=/etc

When building the debian packages, use --sysconfdir=/etc.

Also, don't fudge sysconfdir in the init-ceph script.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---
 ceph.spec.in     | 4 ++--
 src/init-ceph.in | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index 634a99575315c..30a8c96129826 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -57,9 +57,9 @@ conjunction with any FastCGI capable web server.
 %build
 ./autogen.sh
 %if %{with_radosgw}
-%{configure} --prefix=/usr --sbindir=/sbin --without-hadoop --with-radosgw
+%{configure} --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --without-hadoop --with-radosgw
 %else
-%{configure} --prefix=/usr --sbindir=/sbin --without-hadoop --without-radosgw
+%{configure} --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --without-hadoop --without-radosgw
 %endif
 make -j$(getconf _NPROCESSORS_ONLN) CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
diff --git a/src/init-ceph.in b/src/init-ceph.in
index e9dd820c6493d..d26722bed4b50 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -21,12 +21,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