diff options
| author | Alexandre Flament <alex@al-f.net> | 2020-12-20 09:32:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-20 09:32:00 +0100 |
| commit | 72d2bb228959348515194ede87c6a1f022241969 (patch) | |
| tree | 64ab5928698cb1f828834fe56e36c9f7e70ae91f /utils | |
| parent | 32e4eab3369ed1f9534ccabaa36c760b03f0a5b6 (diff) | |
| parent | c89df6739f4ce7f5afd2baaaf727abdedc22c33b (diff) | |
Merge pull request #2399 from return42/fix-lxc
[fix] determine path to makefile.lxc in a LXC
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/lxc.sh | 2 | ||||
| -rw-r--r-- | utils/makefile.include | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/lxc.sh b/utils/lxc.sh index 30534c6a2..11dbe578d 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -20,7 +20,7 @@ lxc_set_suite_env LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}" -# where all folders from HOST are mounted +# Location in the container where all folders from HOST are mounted LXC_SHARE_FOLDER="/share" LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")" diff --git a/utils/makefile.include b/utils/makefile.include index 65aca70f0..35a5134d9 100644 --- a/utils/makefile.include +++ b/utils/makefile.include @@ -3,7 +3,7 @@ ifeq (,$(wildcard /.lxcenv.mk)) PHONY += lxc-activate lxc-purge lxc-activate: - @$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate + @$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate lxc-purge: $(Q)rm -rf ./lxc else |