Merge pull request #2399 from return42/fix-lxc
[fix] determine path to makefile.lxc in a LXC
commit72d2bb228959348515194ede87c6a1f022241969
authorAlexandre Flament <alex@al-f.net>
dateSun 20 Dec 2020, 09:32 (6 years ago)
parent32e4eabc89df67
utils/lxc.sh+1−1
@@ -20,7 +20,7 @@ lxc_set_suite_env
2020
2121LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
2222
23−# where all folders from HOST are mounted
23+# Location in the container where all folders from HOST are mounted
2424LXC_SHARE_FOLDER="/share"
2525LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"
2626
utils/makefile.include+1−1
@@ -3,7 +3,7 @@
33ifeq (,$(wildcard /.lxcenv.mk))
44PHONY += lxc-activate lxc-purge
55lxc-activate:
6− @$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate
6+ @$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate
77lxc-purge:
88 $(Q)rm -rf ./lxc
99else