Revert "config: base default libdir, sysconfdir off autoconf values"

This reverts commit 7e5dee907a8218647a88d1c7d3316cc277e1c44b.

diff --git a/src/Makefile.am b/src/Makefile.am
index 78d8352f53aff4346ddb163b5e6f724d41f1ed72..2d13d72e71cd4b9a489b9b2498369f75fcfbfc0b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -664,7 +664,7 @@ editpaths = sed \
        -e 's|@prefix[@]|$(prefix)|g' \
        -e 's|@@GCOV_PREFIX_STRIP[@][@]|$(GCOV_PREFIX_STRIP)|g'
 
-init-ceph mkcephfs ceph-debugpack ceph-coverage aclocations.h: init-ceph.in mkcephfs.in Makefile ceph-debugpack.in ceph-coverage.in aclocations.h.in
+init-ceph mkcephfs ceph-debugpack ceph-coverage: init-ceph.in mkcephfs.in Makefile ceph-debugpack.in ceph-coverage.in
        rm -f $@ $@.tmp
        $(editpaths) '$(srcdir)/$@.in' >$@.tmp
        chmod +x $@.tmp

diff --git a/src/aclocations.h.in b/src/aclocations.h.in
deleted file mode 100644 (file)
index 3605700..0000000
--- a/src/aclocations.h.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#undef LIBDIR
-#define LIBDIR "@libdir@"
-
-#undef BINDIR
-#define BINDIR "@bindir@"
-
-#undef SYSCONFDIR
-#define SYSCONFDIR "@sysconfdir@"

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 1b423aedb0641c39eb7299708a4c119c65dcbbb5..f9b61d3e50f95b6bfafb68a52d7f8505719ae04c 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -12,8 +12,6 @@
  *
  */
 
-#include "../aclocations.h"
-
 /* note: no header guard */
 OPTION(host, OPT_STR, "localhost")
 OPTION(public_addr, OPT_ADDR, entity_addr_t())
@@ -66,7 +64,7 @@ OPTION(debug_finisher, OPT_INT, 1)
 OPTION(debug_heartbeatmap, OPT_INT, 1)
 OPTION(key, OPT_STR, "")
 OPTION(keyfile, OPT_STR, "")
-OPTION(keyring, OPT_STR, SYSCONFDIR "/ceph/keyring,/etc/ceph/keyring.bin")
+OPTION(keyring, OPT_STR, "/etc/ceph/keyring,/etc/ceph/keyring.bin")
 OPTION(heartbeat_interval, OPT_INT, 5)
 OPTION(heartbeat_file, OPT_STR, "")
 OPTION(ms_tcp_nodelay, OPT_BOOL, true)
@@ -272,7 +270,7 @@ OPTION(osd_scrub_max_interval, OPT_FLOAT, 60*60*24)   // once a day
 OPTION(osd_auto_weight, OPT_BOOL, false)
 OPTION(osd_class_error_timeout, OPT_DOUBLE, 60.0)  // seconds
 OPTION(osd_class_timeout, OPT_DOUBLE, 60*60.0) // seconds
-OPTION(osd_class_dir, OPT_STR, LIBDIR "/rados-classes")
+OPTION(osd_class_dir, OPT_STR, "/usr/lib/rados-classes")
 OPTION(osd_check_for_log_corruption, OPT_BOOL, false)
 OPTION(osd_use_stale_snap, OPT_BOOL, false)
 OPTION(osd_rollback_to_cluster_snap, OPT_STR, "")