From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 25 Feb 2016 16:25:10 +0000 (-0700)
Subject: debian: put libexec files in /usr/lib
X-Git-Tag: v10.0.4~7^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a66bf00b2dfaeaa3bf3060f82f257431b5b2c8d;p=ceph.git

debian: put libexec files in /usr/lib

SUSE does not allow the use of /usr/libexec, so commit
69291f872e7dd20e88c052cfc220e02d59826c0f changed the RPM
packaging to put the libexec files into /usr/lib instead. Do the same
thing on Debian.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index f693294e316b..53ab4336a221 100644
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -8,7 +8,7 @@ usr/bin/ceph-bluefs-tool
 usr/bin/ceph_objectstore_bench
 usr/bin/ceph-osd
 usr/lib/rados-classes/*
-usr/libexec/ceph/ceph-osd-prestart.sh
+usr/lib/ceph/ceph-osd-prestart.sh
 usr/share/man/man8/ceph-clsinfo.8
 usr/share/man/man8/ceph-disk.8
 usr/share/man/man8/ceph-osd.8
diff --git a/debian/rules b/debian/rules
index 2c699aecc9c3..4925944dd286 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ configure-stamp:
 	dh_testdir
 	./autogen.sh
 	./configure --prefix=/usr --localstatedir=/var \
-	  --sysconfdir=/etc $(extraopts) $(confflags) \
+	  --sysconfdir=/etc  --libexecdir=/usr/lib $(extraopts) $(confflags) \
 	  $(CEPH_EXTRA_CONFIGURE_ARGS)
 	touch $@