From 82fe0db9aa83d94c04761ee9907befb5d1e61597 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 10 Aug 2021 16:03:54 -0400 Subject: [PATCH] Fix bad `make protos` failure Signed-off-by: Davanum Srinivas --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1807cfdec..567b9c36b 100644 --- a/Makefile +++ b/Makefile @@ -160,11 +160,11 @@ protos: bin/protoc-gen-gogoctrd ## generate protobuf @echo "$(WHALE) $@" @find . -path ./vendor -prune -false -o -name '*.pb.go' | xargs rm $(eval TMPDIR := $(shell mktemp -d)) - @mv ${ROOTDIR}/vendor $TMPDIR + @mv ${ROOTDIR}/vendor ${TMPDIR} @(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES}) @(PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${NON_API_PACKAGES}) - @mv $TMPDIR ${ROOTDIR}/vendor - @rm -rf $TMPDIR + @mv ${TMPDIR}/vendor ${ROOTDIR} + @rm -rf ${TMPDIR} check-protos: protos ## check if protobufs needs to be generated again @echo "$(WHALE) $@"