RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: fix /sbin vs /usr/sbin behavior

Browse Source 
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>
Tested-by: Alan Somers <asomers@gmail.com>
This commit is contained in:
Sage Weil 2013-10-17 12:06:26 -07:00
parent 15ec5332ba
commit d3f0c0b2a6
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceph.spec.in
View File

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

2
debian/rules vendored
View File

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

7
src/Makefile-env.am
View File

@ -12,6 +12,8 @@ noinst_PROGRAMS =
bin_SCRIPTS =
sbin_PROGRAMS =
sbin_SCRIPTS =
su_sbin_PROGRAMS =
su_sbin_SCRIPTS =
dist_bin_SCRIPTS =
lib_LTLIBRARIES =
noinst_LTLIBRARIES =
@ -22,7 +24,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 =

6
src/Makefile.am
View File

@ -58,9 +58,9 @@ bin_PROGRAMS += ceph-mds
mount_ceph_SOURCES = mount/mount.ceph.c
mount_ceph_LDADD = $(LIBCOMMON)
if LINUX
sbin_PROGRAMS += mount.ceph
su_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