From: Gary Lowell <gary.lowell@inktank.com>
Date: Mon, 8 Jul 2013 21:49:16 +0000 (-0700)
Subject: Revert "Makefile: fix ceph_sbindir"
X-Git-Tag: v0.66~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd1e6d45b96b52c5eccd176b71be1ba92a2a61fd;p=ceph.git

Revert "Makefile: fix ceph_sbindir"

This reverts commit 352f362567bf270d0896fb7573df4ae5139a56fb.

Reverting this commit because it causes problems with the debian build, and
reopening #5492.   The root problem appears to be lack of support by GNU
autotools for installing into both /sbin and /usr/sbin using the standard
location variables.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 91997a164fca..3f8369bfeda0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ bin_PROGRAMS =
 bin_DEBUGPROGRAMS =
 sbin_PROGRAMS =
 # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
-ceph_sbindir = $(sbindir)
+ceph_sbindir = $(prefix)$(sbindir)
 ceph_sbin_SCRIPTS = \
 	ceph-disk \
 	ceph-disk-prepare \