Commit 5e2b1613 authored by Markus Heiser's avatar Markus Heiser

Makefile: marginal fix

Signed-off-by: default avatarMarkus Heiser <markus.heiser@darmarit.de>
parent 0742c250
......@@ -79,7 +79,7 @@ PHONY += docs
docs: pyenvinstall sphinx-doc prebuild-includes
$(call cmd,sphinx,html,docs,docs)
PHONY += docs-live
PHONY += docs-live prebuild-includes
docs-live: pyenvinstall sphinx-live prebuild-includes
$(call cmd,sphinx_autobuild,html,docs,docs)
......
......@@ -63,11 +63,12 @@ lxc_suite_info() {
lxc_set_suite_env
for ip in $(global_IPs) ; do
if [[ $ip =~ .*:.* ]]; then
info_msg "(${ip%|*}) IPv6: http://[${ip#*|}]"
info_msg "(${ip%|*}) IPv6: http://[${ip#*|}]"
else
# IPv4:
info_msg "(${ip%|*}) filtron: http://${ip#*|}:4004/"
info_msg "(${ip%|*}) morty: http://${ip#*|}:3000/"
info_msg "(${ip%|*}) filtron: http://${ip#*|}:4004/"
info_msg "(${ip%|*}) morty: http://${ip#*|}:3000/"
info_msg "(${ip%|*}) docs-live: http://${ip#*|}:8080/"
fi
done
)
......
......@@ -12,9 +12,9 @@ PYDIST = ./$(LXC_ENV_FOLDER)dist
# folder where the python intermediate build files take place
PYBUILD = ./$(LXC_ENV_FOLDER)build
# python version to use
PY ?=3
PYTHON ?= python$(PY)
PIP ?= pip$(PY)
PY =3
PYTHON = python$(PY)
PIP = pip$(PY)
PIP_INST ?= --user
# https://www.python.org/dev/peps/pep-0508/#extras
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment