From 5e2b161379420acd39e0474bb7f59545df7e1f3a Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 29 Mar 2020 16:46:07 +0200 Subject: [PATCH] Makefile: marginal fix Signed-off-by: Markus Heiser --- Makefile | 2 +- utils/lxc-searx.env | 7 ++++--- utils/makefile.python | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3c1bbdc6..60d31690 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env index f81ee1c0..123108bf 100644 --- a/utils/lxc-searx.env +++ b/utils/lxc-searx.env @@ -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 ) diff --git a/utils/makefile.python b/utils/makefile.python index 1660468f..fddcb223 100644 --- a/utils/makefile.python +++ b/utils/makefile.python @@ -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