diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2020-02-03 12:45:42 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2020-02-03 12:45:42 +0100 |
| commit | 61ab65ea273b3c2031c90d13e94509bf00519d88 (patch) | |
| tree | 59234dd752b33506bae0d9af7857fea5a0ab49bf /Makefile | |
| parent | baa51e934ce057af5b5be829d6a73a3e8b4c03d0 (diff) | |
| download | vis-61ab65ea273b3c2031c90d13e94509bf00519d88.tar.gz vis-61ab65ea273b3c2031c90d13e94509bf00519d88.tar.xz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |