From 3010e794daad34513e472fe74ba7374aee0dd669 Mon Sep 17 00:00:00 2001 From: Maksym Melnychok Date: Mon, 4 May 2020 06:17:07 -0700 Subject: [PATCH] install binaries in usr/local to have preference over and no conflicts with python paasta-tools --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 39281a6..a48fb65 100644 --- a/Makefile +++ b/Makefile @@ -33,13 +33,13 @@ docker_build_%: deb_%: clean docker_build_% $(DOCKER_RUN) /bin/bash -c ' \ $(MAKE) cmd && \ - mv bin/paasta{-tools-paasta,_go} && \ + mv bin/paasta{-tools-paasta,} && \ fpm --output-type deb --input-type dir --version $(VERSION) \ --deb-dist $* --deb-priority optional \ --name paasta-tools-go --package dist \ --description "CLI tools for PaaSTA in Go" \ --package dist/$* \ - bin=/usr/ && \ + bin=/usr/local/ && \ chown -R $(UID):$(GID) bin dist \ '