python: avoid long paths (part 2)

make CEPH_BUILD_VIRTUALENV=/tmp TESTS=ceph-detect-init/run-tox.sh check

sets the CEPH_DETECT_INIT_VIRTUALENV environment variable

CEPH_BUILD_VIRTUALENV=/tmp make TESTS=ceph-detect-init/run-tox.sh check

does not because Makefile-env.am overrides it.

Do not set CEPH_BUILD_VIRTUALENV in Makefile-env.am so the variable from
the environment can be used. Require that CEPH_BUILD_VIRTUALENV has a
trailing slash so that the default is just an empty variable.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index cb77d9da4a4a15ac1df8d20c062f25e98b6d2547..cf5a69298b366212f282c9aa7dfbbcc185759bbc 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -299,5 +299,3 @@ DENCODER_DEPS =
 
 
 radoslibdir = $(libdir)/rados-classes
-
-CEPH_BUILD_VIRTUALENV = .

diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
index 8ddcb1eaeae0a13c9e753d9a4c67db17bf1519d1..0d199e741daae84d863bf1ebc15f78db14066a60 100644 (file)
--- a/src/ceph-detect-init/Makefile.am
+++ b/src/ceph-detect-init/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST += \
        ceph-detect-init/tests/test_all.py \
        ceph-detect-init/tox.ini
 
-export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv
+export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}ceph-detect-init-virtualenv
 
 ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV}
 

diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
index 900630382a1371d570de8add94a69bf689f80652..952a486566c20934616f422e028b48e27790ffde 100644 (file)
--- a/src/ceph-disk/Makefile.am
+++ b/src/ceph-disk/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST += \
        ceph-disk/tests/test_main.py \
        ceph-disk/tox.ini
 
-export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv
+export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}ceph-disk-virtualenv
 
 ceph-disk-all: ${CEPH_DISK_VIRTUALENV}