From 352f362567bf270d0896fb7573df4ae5139a56fb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Jul 2013 22:10:34 -0700 Subject: [PATCH] Makefile: fix ceph_sbindir From Denis Kaganovich : At least in some cases, scripts (ceph-disk*, ceph-create-keys) installing into /usr/usr/sbin. This happened while "ceph_sbindir = $(prefix)$(sbindir)" in src/Makefile.am and " ./configure --prefix=/usr ..." (Gentoo's default configure call). I don't dig too deep, but IMHO it can be result of "prefix=" & "exec_prefix=" disorder. Fixed for me by "ceph_sbindir = $(sbindir)" (I don't try other configure behaviors, but looks universal). Reported-by: Denis Kaganovich Fixes: #5492 Signed-off-by: Sage Weil --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3f8369bfeda0..91997a164fca 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 = $(prefix)$(sbindir) +ceph_sbindir = $(sbindir) ceph_sbin_SCRIPTS = \ ceph-disk \ ceph-disk-prepare \ -- 2.47.3