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

automake: in deb pkg, use --syconfdir=/etc

Browse Source 
When building the debian packages, use --sysconfdir=/etc.

Also, don't fudge sysconfdir in the init-ceph script.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
This commit is contained in:
Colin Patrick McCabe 2010-12-07 10:48:19 -08:00
parent 57bcdc54d5
commit 10b6887eae
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph.spec.in
View File

@ -57,9 +57,9 @@ conjunction with any FastCGI capable web server.
%build
./autogen.sh
%if %{with_radosgw}
%{configure} --prefix=/usr --sbindir=/sbin --without-hadoop --with-radosgw
%{configure} --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --without-hadoop --with-radosgw
%else
%{configure} --prefix=/usr --sbindir=/sbin --without-hadoop --without-radosgw
%{configure} --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --without-hadoop --without-radosgw
%endif
make -j$(getconf _NPROCESSORS_ONLN) CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"

7
src/init-ceph.in
View File

@ -21,12 +21,7 @@ if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
else
BINDIR=@bindir@
LIBDIR=@libdir@/ceph
# i hate autoconf:
if [ "@sysconfdir@" = "/usr/etc" ]; then
ETCDIR=/etc/ceph
else
ETCDIR=@sysconfdir@/ceph
fi
ETCDIR=@sysconfdir@/ceph
fi
usage_exit() {