Merge pull request #8392 from dachary/wip-virtualenv-jewel

Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 3)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Sage Weil 2016-05-04 09:27:58 -04:00
commit c990345989
2 changed files with 2 additions and 2 deletions

View File

@ -23,7 +23,7 @@ if [ x"`uname`"x = xFreeBSDx ]; then
fi
# run from the ceph-detect-init directory or from its parent
: ${CEPH_DETECT_INIT_VIRTUALENV:=ceph-detect-init-virtualenv}
: ${CEPH_DETECT_INIT_VIRTUALENV:=/tmp/ceph-detect-init-virtualenv}
test -d ceph-detect-init && cd ceph-detect-init
source ${CEPH_DETECT_INIT_VIRTUALENV}/bin/activate
tox > ${CEPH_DETECT_INIT_VIRTUALENV}/tox.out 2>&1

View File

@ -16,7 +16,7 @@
#
# run from the ceph-disk directory or from its parent
: ${CEPH_DISK_VIRTUALENV:=ceph-disk-virtualenv}
: ${CEPH_DISK_VIRTUALENV:=/tmp/ceph-disk-virtualenv}
test -d ceph-disk && cd ceph-disk
source ${CEPH_DISK_VIRTUALENV}/bin/activate
tox > ${CEPH_DISK_VIRTUALENV}/tox.out 2>&1