]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
python: Pass prefix/sbindir from autoconf to distutils. 8436/head
authorRobin H. Johnson <robin.johnson@dreamhost.com>
Mon, 4 Apr 2016 23:17:54 +0000 (16:17 -0700)
committerRobin H. Johnson <robin.johnson@dreamhost.com>
Mon, 4 Apr 2016 23:17:54 +0000 (16:17 -0700)
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
src/ceph-detect-init/Makefile.am
src/ceph-disk/Makefile.am

index 8ddcb1eaeae0a13c9e753d9a4c67db17bf1519d1..a2d1879c28ed1f882a97a3c434a1a5d8e2dd13e8 100644 (file)
@@ -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 ; \
index 900630382a1371d570de8add94a69bf689f80652..0cf1d6bad022fe6f875d0fcd93f17a3101f1160c 100644 (file)
@@ -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