From 61ab65ea273b3c2031c90d13e94509bf00519d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Mon, 3 Feb 2020 12:45:42 +0100 Subject: build: explicitly specify working directory for docker Otherwise the config.mk file generated by ./configure does not end up in the source tree and has no effect. Our Makefile does currently not support out of tree builds. Previously this worked because the WORKDIR within the Dockerfile was set to the vis source (and build) directory. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1cfe989..0b8bdb8 100644 --- a/Makefile +++ b/Makefile @@ -90,11 +90,11 @@ docker: clean $(DOCKER) exec vis apk update $(DOCKER) exec vis apk upgrade $(DOCKER) cp . vis:/build/vis - $(DOCKER) exec vis ./vis/configure CC='cc --static' \ + $(DOCKER) exec -w /build/vis vis ./configure CC='cc --static' \ --enable-acl \ --enable-lua \ --enable-lpeg-static - $(DOCKER) exec vis make -C vis VERSION="$(VERSION)" clean vis-single + $(DOCKER) exec -w /build/vis vis make VERSION="$(VERSION)" clean vis-single $(DOCKER) cp vis:/build/vis/vis-single vis $(DOCKER) kill vis -- cgit v1.2.3