From: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
Date: Mon, 5 May 2014 07:54:19 +0000 (+0200)
Subject: Fix installation into user home directory, broken by d3f0c0b
X-Git-Tag: v0.81~68^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1764%2Fhead;p=ceph.git

Fix installation into user home directory, broken by d3f0c0b

Signed-off-by: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
---

diff --git a/configure.ac b/configure.ac
index b7a36ce54372..46a2a30457c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,7 +325,7 @@ AM_CONDITIONAL(WITH_RADOSGW, test "$RADOSGW" = "1")
 
 AS_IF([test "$RADOSGW" = "1"], [AC_DEFINE([WITH_RADOSGW], [1], [define if radosgw enabled])])
 
-AS_IF([test "$RADOSGW" = "1"], 
+AS_IF([test "$RADOSGW" = "1"],
               [AC_CHECK_LIB([curl], [curl_multi_wait],
                             AC_DEFINE([HAVE_CURL_MULTI_WAIT], [1], [Define if have curl_multi_wait()]))
               ])
@@ -416,7 +416,7 @@ if test "x$enable_cephfs_java" = "xyes"; then
        ])
 
         # cephfs_java_test only makes sense if java is already turned on
-	# setup CLASSPATH for Debian default junit4.jar package 
+	# setup CLASSPATH for Debian default junit4.jar package
         #
         # Configuring --with-debug and --enable-cephfs-java will throw an error if
         # JUnit4 cannot be found. While currently this works for users who have
@@ -538,7 +538,7 @@ AC_ARG_WITH([libaio],
 AS_IF([test "x$with_libaio" != xno],
 	    [AC_CHECK_LIB([aio], [io_submit], [true], AC_MSG_FAILURE([libaio not found]))])
 AS_IF([test "x$with_libaio" != xno],
-	    [AC_CHECK_HEADER([libaio.h])])	
+	    [AC_CHECK_HEADER([libaio.h])])
 AS_IF([test "$with_libaio" = "yes"],
 	    [AC_DEFINE([HAVE_LIBAIO], [1], [Defined if you don't have atomic_ops])])
 AM_CONDITIONAL(WITH_LIBAIO, [ test "$with_libaio" = "yes" ])
@@ -785,6 +785,7 @@ AC_FUNC_STRERROR_R
 AC_LANG_POP([C++])
 
 AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
+AM_CONDITIONAL(USR_EXEC_PREFIX, test $exec_prefix -eq /usr)
 
 AM_PATH_PYTHON([2.4],
 	[], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])])
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index b6af080faf5b..b99fdc533419 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -15,8 +15,8 @@ sbin_SCRIPTS =
 su_sbin_PROGRAMS =
 su_sbin_SCRIPTS =
 dist_bin_SCRIPTS =
-lib_LTLIBRARIES = 
-noinst_LTLIBRARIES = 
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 noinst_LIBRARIES =
 radoslib_LTLIBRARIES =
 
@@ -26,8 +26,12 @@ bin_DEBUGPROGRAMS =
 # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
 ceph_sbindir = $(sbindir)
 
-# certain things go straight into /sbin, though!
-su_sbindir = /sbin
+# certain things go straight into /sbin if installed under /usr, though!
+if USR_EXEC_PREFIX
+  su_sbindir = /sbin
+else
+  su_sbindir = $(exec_prefix)/sbin
+endif
 
 # C/C++ tests to build will be appended to this
 check_PROGRAMS =
@@ -194,4 +198,3 @@ DENCODER_DEPS =
 
 
 radoslibdir = $(libdir)/rados-classes
-