From 86e79488aab3ff434c6682a9464ba2eee49158e9 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 15 Mar 2020 17:01:36 +0100 Subject: LXC: utils/makefile.lxc (inital) add /.lxcenv.mk to contaiiners Get LXC environment when building make targets. Signed-off-by: Markus Heiser --- utils/makefile.include | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'utils/makefile.include') diff --git a/utils/makefile.include b/utils/makefile.include index 716889c02..933d2b57a 100644 --- a/utils/makefile.include +++ b/utils/makefile.include @@ -1,12 +1,23 @@ # -*- coding: utf-8; mode: makefile-gmake -*- +ifeq (,$(wildcard /.lxcenv.mk)) +PHONY += lxc-activate +lxc-activate: + @$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate +else + include /.lxcenv.mk +endif + +ifeq (,$(wildcard /.lxcenv.mk)) make-help: +else +make-help: lxc-help +endif @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' @echo ' make V=2 [targets] 2 => give reason for rebuild of target' quiet_cmd_common_clean = CLEAN $@ cmd_common_clean = \ - rm -rf tests/build ;\ find . -name '*.orig' -exec rm -f {} + ;\ find . -name '*.rej' -exec rm -f {} + ;\ find . -name '*~' -exec rm -f {} + ;\ @@ -126,3 +137,4 @@ echo-cmd = $(if $($(quiet)cmd_$(1)),echo '$(call escsq,$($(quiet)cmd_$(1)))$(ech # printing commands cmd = @$(echo-cmd) $(cmd_$(1)) +.PHONY: $(PHONY) -- cgit v1.2.3 From ee39a098acb2386abd5382de5c9476cc4ffe2e03 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 7 Apr 2020 18:31:51 +0200 Subject: apache: normalize installation (docs and script)s over all distros Signed-off-by: Markus Heiser --- utils/makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'utils/makefile.include') diff --git a/utils/makefile.include b/utils/makefile.include index 933d2b57a..65aca70f0 100644 --- a/utils/makefile.include +++ b/utils/makefile.include @@ -1,9 +1,11 @@ # -*- coding: utf-8; mode: makefile-gmake -*- ifeq (,$(wildcard /.lxcenv.mk)) -PHONY += lxc-activate +PHONY += lxc-activate lxc-purge lxc-activate: @$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate +lxc-purge: + $(Q)rm -rf ./lxc else include /.lxcenv.mk endif -- cgit v1.2.3