diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-15 15:21:59 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-15 15:21:59 -0700 |
| commit | d49cfc301b7395039ba4323b81814a194b850ee0 (patch) | |
| tree | 658b0e1e11b5d5d8b331d8b36db48d58f2497b54 | |
| parent | 53ff63c2f8098fa45a363ec9d1a617edd21808d5 (diff) | |
| download | ceph-wip-6456.tar.gz | |
Makefile: fix /sbin vs /usr/sbin behaviorwip-6456
Instead of telling configure to put things in /sbin, explicitly put the
two important items (mkcephfs and mount.fuse.ceph) in /sbin via an
automake rule. This unbreaks FreeBSD 9.1 and probably others.
Based on patches originally from Alan Somers <asomers@gmail.com>, modified
for the current Makefile structure and applied to the specfile too.
Fixes: #6456
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | ceph.spec.in | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | src/Makefile-env.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index bcb1214cc93..851a343253a 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -269,7 +269,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` %{configure} CPPFLAGS="$java_inc" \ --prefix=/usr \ - --sbindir=/sbin \ --localstatedir=/var \ --sysconfdir=/etc \ --docdir=%{_docdir}/ceph \ diff --git a/debian/rules b/debian/rules index c32c3e280b3..f35e6c2601c 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ configure: configure-stamp configure-stamp: dh_testdir ./autogen.sh - ./configure --prefix=/usr --sbindir=/sbin --localstatedir=/var \ + ./configure --prefix=/usr --localstatedir=/var \ --sysconfdir=/etc $(extraopts) $(confflags) \ $(CEPH_EXTRA_CONFIGURE_ARGS) touch $@ diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 6a4e09512a2..188c61568c0 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -12,6 +12,7 @@ noinst_PROGRAMS = bin_SCRIPTS = sbin_PROGRAMS = sbin_SCRIPTS = +su_sbin_SCRIPTS = dist_bin_SCRIPTS = lib_LTLIBRARIES = noinst_LTLIBRARIES = @@ -22,7 +23,10 @@ radoslib_LTLIBRARIES = bin_DEBUGPROGRAMS = # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin -ceph_sbindir = $(exec_prefix)$(sbindir) +ceph_sbindir = $(sbindir) + +# certain things go straight into /sbin, though! +su_sbindir = /sbin # C/C++ tests to build will be appended to this check_PROGRAMS = diff --git a/src/Makefile.am b/src/Makefile.am index 280b268479e..cde204c5db9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,7 +60,7 @@ mount_ceph_LDADD = $(LIBCOMMON) if LINUX sbin_PROGRAMS += mount.ceph endif # LINUX -sbin_SCRIPTS += mount.fuse.ceph +su_sbin_SCRIPTS += mount.fuse.ceph cephfs_SOURCES = cephfs.cc cephfs_LDADD = $(LIBCOMMON) @@ -239,7 +239,7 @@ bin_SCRIPTS += \ ceph-post-file BUILT_SOURCES += init-ceph -sbin_SCRIPTS += mkcephfs +su_sbin_SCRIPTS += mkcephfs shell_scripts += init-ceph mkcephfs |