pyrox.dev
1diff --git a/src/Makefile-env.am b/src/Makefile-env.am
2index e176596..384e230 100644
3--- a/src/Makefile-env.am
4+++ b/src/Makefile-env.am
5@@ -40,7 +40,7 @@ check_SCRIPTS =
6 export VERBOSE = true
7
8 # python unit tests need to know where the scripts are located
9-export PYTHONPATH=$(top_srcdir)/src/pybind
10+export PYTHONPATH+=:$(top_srcdir)/src/pybind
11
12 # when doing a debug build, make sure to make the targets
13 if WITH_DEBUG
14diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
15index 3e5ad03..66d6683 100644
16--- a/src/ceph-detect-init/Makefile.am
17+++ b/src/ceph-detect-init/Makefile.am
18@@ -64,9 +64,10 @@ install-data-local::
19 if test "$(DESTDIR)" ; then \
20 if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
21 options=--install-layout=deb ; \
22- else \
23- options=--prefix=/usr ; \
24 fi ; \
25 root="--root=$(DESTDIR)" ; \
26 fi ; \
27- python setup.py install $$root $$options
28+ if test "$(prefix)"; then \
29+ prefix="--prefix=$(prefix)" ; \
30+ fi ; \
31+ python setup.py install $$prefix $$root $$options