Merge pull request #8436 from dreamhost/wip-python-prefix

python: Pass prefix/sbindir from autoconf to distutils. Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Jun 11, 2016 · fb2667f · fb2667f
2 parents 9db46b0 + 97b9734
commit fb2667f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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