]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "Makefile: fix ceph_sbindir"
authorGary Lowell <gary.lowell@inktank.com>
Mon, 8 Jul 2013 21:49:16 +0000 (14:49 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Mon, 8 Jul 2013 21:49:16 +0000 (14:49 -0700)
This reverts commit 352f362567bf270d0896fb7573df4ae5139a56fb.

Reverting this commit because it causes problems with the debian build, and
reopening #5492.   The root problem appears to be lack of support by GNU
autotools for installing into both /sbin and /usr/sbin using the standard
location variables.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
src/Makefile.am

index 91997a164fca622eb308b36d46f4c1b382a22e37..3f8369bfeda0f09f0ec3d0b2bd2374118f2d55bd 100644 (file)
@@ -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 = $(sbindir)
+ceph_sbindir = $(prefix)$(sbindir)
 ceph_sbin_SCRIPTS = \
        ceph-disk \
        ceph-disk-prepare \