move mkcephfs to /sbin

diff --git a/ceph.spec.in b/ceph.spec.in
index c3ba8382140264b3743ad3b39517f615827ce533..3e8f4a38d376684aac5399c7739ddfe3545cba22 100644 (file)
--- 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 5efd2e945f56e74e11d48e8e802384db8d339eb5..dba002778e17f37d0e49db5e7c122df0ba3eec31 100644 (file)
--- 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 7166d922068f98b216086c261e7f409c1036bc43..7c5dfcabbb49dda65645b85af187c42ac3bbc416 100644 (file)
--- 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