From b502be7a8df4526875b91e6ad3ede72dec1c1b75 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 30 Jul 2010 12:06:10 -0700
Subject: [PATCH] move mkcephfs to /sbin

---
 ceph.spec.in        | 2 +-
 debian/ceph.install | 2 +-
 src/Makefile.am     | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index c3ba838214026..3e8f4a38d3766 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -118,7 +118,7 @@ fi
 %{_libdir}/libcrush.so.*
 %{_libdir}/librados.so.*
 %{_libdir}/rados-classes/libcls_rbd.so.*
-%{_sbindir}/mkcephfs
+/sbin/mkcephfs
 /sbin/mount.ceph
 %{_libdir}/ceph
 %{_docdir}/sample.ceph.conf
diff --git a/debian/ceph.install b/debian/ceph.install
index 5efd2e945f56e..dba002778e17f 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -14,7 +14,7 @@ usr/bin/cauthtool
 usr/bin/rados
 usr/bin/rbd
 sbin/mount.ceph
-usr/sbin/mkcephfs
+sbin/mkcephfs
 usr/lib/ceph/ceph_common.sh
 usr/lib/rados-classes/*
 usr/share/doc/ceph/sample.ceph.conf
diff --git a/src/Makefile.am b/src/Makefile.am
index 7166d922068f9..7c5dfcabbb49d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,8 +278,7 @@ install-data-local:
 	$(install_sh_SCRIPT) -m 0755 cclass $(DESTDIR)$(bindir)/cclass
 	$(install_sh_SCRIPT) -m 0755 cclsinfo $(DESTDIR)$(bindir)/cclsinfo
 	sh -c "if [ \"$(sbindir)\" = \"/usr/sbin\" ]; then mkdir -p $(DESTDIR)/sbin ; $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)/sbin/mount.ceph ; else mkdir -p $(DESTDIR)$(sbindir) ; $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)$(sbindir)/mount.ceph ; fi"
-	mkdir -p $(DESTDIR)$(sbindir)/ceph
-	$(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs
+	sh -c "if [ \"$(sbindir)\" = \"/usr/sbin\" ]; then mkdir -p $(DESTDIR)/sbin ; $(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)/sbin/mkcephfs ; else mkdir -p $(DESTDIR)$(sbindir) ; $(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs ; fi"
 	mkdir -p $(DESTDIR)$(libdir)/ceph
 	$(install_sh_SCRIPT) -m 0755 ceph_common.sh $(DESTDIR)$(libdir)/ceph/ceph_common.sh
 	mkdir -p $(DESTDIR)$(sysconfdir)/ceph
-- 
2.39.5