Browse Source

[fix] determine path to makefile.lxc in a LXC

The path to the makefile.lxc is not always static and
'/share/searx/utils/makefile.lxc' can be wrong.

When target 'lxc.activate' is called within the LXC container the path to
makefile.lxc depends on LXC_SHARE_FOLDER and the basename of the folder where
searx was cloned inital on the HOST system.

This patch determines the path of 'makefile.lxc' next to 'makefile.include'
itself.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 4 years ago
parent
commit
c89df6739f
2 changed files with 2 additions and 2 deletions
  1. 1 1
      utils/lxc.sh
  2. 1 1
      utils/makefile.include

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

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