From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 4 Apr 2013 13:54:31 +0000 (+0200)
Subject: Makefile.am: install ceph-* python scripts to /usr/bin directly
X-Git-Tag: v0.62~88^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d16f38f48e276497190c8bc03abc55c40e18eed;p=ceph.git

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>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 09f1e934b23a..5fe7da683eb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,12 +27,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