forked from Ponysearch/Ponysearch
Makefile: marginal fix
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
0742c2504d
commit
5e2b161379
3 changed files with 8 additions and 7 deletions
2
Makefile
2
Makefile
|
@ -79,7 +79,7 @@ PHONY += docs
|
||||||
docs: pyenvinstall sphinx-doc prebuild-includes
|
docs: pyenvinstall sphinx-doc prebuild-includes
|
||||||
$(call cmd,sphinx,html,docs,docs)
|
$(call cmd,sphinx,html,docs,docs)
|
||||||
|
|
||||||
PHONY += docs-live
|
PHONY += docs-live prebuild-includes
|
||||||
docs-live: pyenvinstall sphinx-live prebuild-includes
|
docs-live: pyenvinstall sphinx-live prebuild-includes
|
||||||
$(call cmd,sphinx_autobuild,html,docs,docs)
|
$(call cmd,sphinx_autobuild,html,docs,docs)
|
||||||
|
|
||||||
|
|
|
@ -63,11 +63,12 @@ lxc_suite_info() {
|
||||||
lxc_set_suite_env
|
lxc_set_suite_env
|
||||||
for ip in $(global_IPs) ; do
|
for ip in $(global_IPs) ; do
|
||||||
if [[ $ip =~ .*:.* ]]; then
|
if [[ $ip =~ .*:.* ]]; then
|
||||||
info_msg "(${ip%|*}) IPv6: http://[${ip#*|}]"
|
info_msg "(${ip%|*}) IPv6: http://[${ip#*|}]"
|
||||||
else
|
else
|
||||||
# IPv4:
|
# IPv4:
|
||||||
info_msg "(${ip%|*}) filtron: http://${ip#*|}:4004/"
|
info_msg "(${ip%|*}) filtron: http://${ip#*|}:4004/"
|
||||||
info_msg "(${ip%|*}) morty: http://${ip#*|}:3000/"
|
info_msg "(${ip%|*}) morty: http://${ip#*|}:3000/"
|
||||||
|
info_msg "(${ip%|*}) docs-live: http://${ip#*|}:8080/"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
|
|
|
@ -12,9 +12,9 @@ PYDIST = ./$(LXC_ENV_FOLDER)dist
|
||||||
# folder where the python intermediate build files take place
|
# folder where the python intermediate build files take place
|
||||||
PYBUILD = ./$(LXC_ENV_FOLDER)build
|
PYBUILD = ./$(LXC_ENV_FOLDER)build
|
||||||
# python version to use
|
# python version to use
|
||||||
PY ?=3
|
PY =3
|
||||||
PYTHON ?= python$(PY)
|
PYTHON = python$(PY)
|
||||||
PIP ?= pip$(PY)
|
PIP = pip$(PY)
|
||||||
PIP_INST ?= --user
|
PIP_INST ?= --user
|
||||||
|
|
||||||
# https://www.python.org/dev/peps/pep-0508/#extras
|
# https://www.python.org/dev/peps/pep-0508/#extras
|
||||||
|
|
Loading…
Reference in a new issue