Browse Source

Makefile: marginal fix

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 5 years ago
parent
commit
5e2b161379
3 changed files with 8 additions and 7 deletions
  1. 1 1
      Makefile
  2. 4 3
      utils/lxc-searx.env
  3. 3 3
      utils/makefile.python

+ 1 - 1
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)
 

+ 4 - 3
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
     )

+ 3 - 3
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