From 0d7147ff5c7bbff1b892bb963e674df65fb1fa6d Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Wed, 25 Jan 2017 00:07:05 +1100
Subject: [PATCH] make: revert switch to 'go install'

go install acts incredibly weirdly and rarely does what you want, not to
mention that it's just bad for distribution build setups. Switch back to
go build, which works properly and doesn't have half as many issues.

Fixes: 6c9628cdb11e ("Build and install from GOPATH")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
---
 .gitignore        |  3 +++
 Makefile          | 15 +++++++--------
 test/helpers.bash |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59b6efe0..450fa596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ test/bin2img/bin2img
 test/copyimg/copyimg
 test/testdata/redis-image
 test/checkseccomp/checkseccomp
+ocid
+ocic
+kpod
diff --git a/Makefile b/Makefile
index 575d5e64..406ccb4c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,6 @@ ETCDIR ?= ${DESTDIR}/etc
 ETCDIR_OCID ?= ${ETCDIR}/ocid
 BUILDTAGS := selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh)
 BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
-GOBINDIR := $(word 1,$(subst :, ,$(GOPATH)))
-PATH := $(GOBINDIR)/bin:$(PATH)
 
 all: binaries ocid.conf docs
 
@@ -60,15 +58,15 @@ checkseccomp: check-gopath
 	$(MAKE) -C test/$@
 
 ocid: check-gopath
-	$(GO) install \
+	$(GO) build -o $@ \
 		-tags "$(BUILDTAGS)" \
 		$(PROJECT)/cmd/ocid
 
 ocic: check-gopath
-	$(GO) install $(PROJECT)/cmd/ocic
+	$(GO) build -o $@ $(PROJECT)/cmd/ocic
 
 kpod: check-gopath
-	$(GO) install $(PROJECT)/cmd/kpod
+	$(GO) build -o $@ $(PROJECT)/cmd/kpod
 
 ocid.conf: ocid
 	ocid --config="" config --default > ocid.conf
@@ -78,6 +76,7 @@ clean:
 	rm -fr test/testdata/redis-image
 	find . -name \*~ -delete
 	find . -name \#\* -delete
+	rm -f ocic ocid kpod
 	make -C conmon clean
 	make -C pause clean
 	make -C test/bin2img clean
@@ -113,9 +112,9 @@ docs/%.8: docs/%.8.md check-gopath
 docs: $(MANPAGES)
 
 install: check-gopath
-	install -D -m 755 $(GOBINDIR)/bin/ocid $(BINDIR)/ocid
-	install -D -m 755 $(GOBINDIR)/bin/ocic $(BINDIR)/ocic
-	install -D -m 755 $(GOBINDIR)/bin/kpod $(BINDIR)/kpod
+	install -D -m 755 ocid $(BINDIR)/ocid
+	install -D -m 755 ocic $(BINDIR)/ocic
+	install -D -m 755 kpod $(BINDIR)/kpod
 	install -D -m 755 conmon/conmon $(LIBEXECDIR)/ocid/conmon
 	install -D -m 755 pause/pause $(LIBEXECDIR)/ocid/pause
 	install -d -m 755 $(MANDIR)/man1
diff --git a/test/helpers.bash b/test/helpers.bash
index d641ca48..3bff7e19 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -10,9 +10,9 @@ TESTDATA="${INTEGRATION_ROOT}/testdata"
 OCID_ROOT=${OCID_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)}
 
 # Path of the ocid binary.
-OCID_BINARY=${OCID_BINARY:-${GOPATH}/bin/ocid}
+OCID_BINARY=${OCID_BINARY:-${OCID_ROOT}/cri-o/ocid}
 # Path of the ocic binary.
-OCIC_BINARY=${OCIC_BINARY:-${GOPATH}/bin/ocic}
+OCIC_BINARY=${OCIC_BINARY:-${OCID_ROOT}/cri-o/ocic}
 # Path of the conmon binary.
 CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/cri-o/conmon/conmon}
 # Path of the pause binary.