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>

diff --git a/ceph.spec.in b/ceph.spec.in
index 634a99575315ce806c0955639c4078686e4d6046..30a8c96129826adf6967e82610382c72b8f7edd1 100644 (file)
--- 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 e9dd820c6493d6241dc5d0e40c858bb946139969..d26722bed4b50e364bcb0b4e45b688d9e5db7f1d 100644 (file)
--- 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() {