summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2020-04-08 20:42:02 +0200
committerMiloslav Trmač <mitr@redhat.com>2020-04-08 20:42:02 +0200
commit439485f0968d28130dbbb0ac55a8bf5d2c2d9d3a (patch)
treec954f775dceeb62fdeec708f6770693cc6b2a5e9
parent291ad7fbd9797340015b71b448c6637669176878 (diff)
downloadpodman-439485f0968d28130dbbb0ac55a8bf5d2c2d9d3a.tar.gz
podman-439485f0968d28130dbbb0ac55a8bf5d2c2d9d3a.tar.bz2
podman-439485f0968d28130dbbb0ac55a8bf5d2c2d9d3a.zip
Fix (make vendor)
(export a=b command args) does not run (command args) with a=b, it sets $a to b, and marks variables $a $command $args as exported, i.e. (command args) is not run. So we were not actually running (go mod tidy). Fix that. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 92e0f1539..0797f3908 100644
--- a/Makefile
+++ b/Makefile
@@ -637,10 +637,9 @@ build-no-cgo:
.PHONY: vendor
vendor:
- export GO111MODULE=on \
- $(GO) mod tidy && \
- $(GO) mod vendor && \
- $(GO) mod verify
+ GO111MODULE=on $(GO) mod tidy
+ GO111MODULE=on $(GO) mod vendor
+ GO111MODULE=on $(GO) mod verify
.PHONY: vendor-in-container
vendor-in-container: