diff options
| author | Gary Lowell <gary.lowell@inktank.com> | 2013-07-10 14:28:35 -0700 |
|---|---|---|
| committer | Gary Lowell <gary.lowell@inktank.com> | 2013-07-10 14:28:35 -0700 |
| commit | 348acecb8de1b2602811bc51b937b8c1858a0484 (patch) | |
| tree | ef400c6307ac495f0a8e820f8d9bad0be3507ec9 | |
| parent | dcb42ca36c566e2983592801f7f24429c5add85b (diff) | |
| parent | a120d81df6a131cf4d9cabd07593e8fff8c46b96 (diff) | |
| download | ceph-348acecb8de1b2602811bc51b937b8c1858a0484.tar.gz | |
Merge branch 'wip-5492-gl' into next
Re-instate fix for #5492 with corrections.
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1e92f2f74b5..a25ccf54b84 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 = $(exec_prefix)$(sbindir) ceph_sbin_SCRIPTS = \ ceph-disk \ ceph-disk-prepare \ |