summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-04-04 15:54:31 +0200
committerSage Weil <sage@inktank.com>2013-04-26 13:40:07 -0700
commit0b42b1edb306a9763bcd02bd962bd284f6b7b3a3 (patch)
treea13e26a7d9043cc87af5b3782a49ec898a634a76
parentc71fb8d5b39667fc2c9f7e898ced53059d3f1eec (diff)
downloadceph-0b42b1edb306a9763bcd02bd962bd284f6b7b3a3.tar.gz
Makefile.am: install ceph-* python scripts to /usr/bin directly
Install ceph-* scripts directly to $(prefix)$(sbindir) (which normaly would be /usr/sbin) instead of moving it around after installation in SPEC file or debian files. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 4d16f38f48e276497190c8bc03abc55c40e18eed)
-rw-r--r--src/Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 63608688e75..7eabd62b121 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,12 +26,17 @@ bin_PROGRAMS =
# like bin_PROGRAMS, but these targets are only built for debug builds
bin_DEBUGPROGRAMS =
sbin_PROGRAMS =
-sbin_SCRIPTS = \
+# like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
+ceph_sbindir = $(prefix)$(sbindir)
+ceph_sbin_SCRIPTS = \
ceph-disk \
ceph-disk-prepare \
ceph-disk-activate \
- ceph-create-keys \
+ ceph-create-keys
+
+sbin_SCRIPTS = \
mount.fuse.ceph
+
bin_SCRIPTS = ceph-run $(srcdir)/ceph-clsinfo ceph-debugpack ceph-rbdnamer
dist_bin_SCRIPTS =
# C/C++ tests to build will be appended to this