From: Robin H. Johnson <robin.johnson@dreamhost.com>
Date: Mon, 4 Apr 2016 23:17:54 +0000 (-0700)
Subject: python: Pass prefix/sbindir from autoconf to distutils.
X-Git-Tag: v11.0.0~220^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97b97340bea0f922bcd078e4bc2271e2a48e7902;p=ceph.git

python: Pass prefix/sbindir from autoconf to distutils.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
---

diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
index 8ddcb1eaeae..a2d1879c28e 100644
--- a/src/ceph-detect-init/Makefile.am
+++ b/src/ceph-detect-init/Makefile.am
@@ -69,7 +69,7 @@ ceph-detect-init-install-data:
 		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
 			options=--install-layout=deb ; \
 		else \
-			options=--prefix=/usr ; \
+			options=--prefix=$(prefix) ; \
 		fi ; \
 		root="--root=$(DESTDIR)" ; \
 	fi ; \
diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
index 900630382a1..0cf1d6bad02 100644
--- a/src/ceph-disk/Makefile.am
+++ b/src/ceph-disk/Makefile.am
@@ -45,9 +45,9 @@ ceph-disk-install-data:
 		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
 			options=--install-layout=deb ; \
 		else \
-			options=--prefix=/usr ; \
+			options=--prefix=$(prefix) ; \
 		fi ; \
-		root="--root=$(DESTDIR) --install-script=/usr/sbin" ; \
+		root="--root=$(DESTDIR) --install-script=$(sbindir)" ; \
 	fi ; \
 	python setup.py install $$root $$options