Cleanups and small fixes

Author: tashian

Makefile

@@ -1,16 +1,26 @@
-# Variables:
-# V=1 for verbose output.
-# BINNAME=step to change the name of the executable
-# PREFIX=bin/ to change the build output path
-# DESTDIR=/usr/local/bin to change the install path
-# GOOS_OVERRIDE="GOOS=linux GOARCH=arm GOARM=6" to change OS and arch
-# CGO_OVERRIDE="CGO_ENABLED=1" to enable CGO
-#
 # Run `make bootstrap` to set up your local environment.
 # To build using go, use `make build`
 # For a binary that's in parity with how our CI system builds,
 # run `make goreleaser` to build using GoReleaser Pro.
 
+# Variables:
+# V=1 for verbose output.
+
+# the name of the executable
+BINNAME?=step
+
+# the build output path
+PREFIX?=bin
+
+# the install path
+DESTDIR?=/usr/local/bin
+
+# GOOS_OVERRIDE="GOOS=linux GOARCH=arm GOARM=6" to change OS and arch
+GOOS_OVERRIDE?=
+
+# CGO_OVERRIDE="CGO_ENABLED=1" to enable CGO
+CGO_OVERRIDE?=CGO_ENABLED=0
+
 all: lint test build
 
 ci: test build
@@ -55,12 +65,8 @@ else
 endif
 
 Q=$(if $V,,@)
-PREFIX?=
 SRC=$(shell find . -type f -name '*.go')
-GOOS_OVERRIDE ?=
-CGO_OVERRIDE ?= CGO_ENABLED=0
 OUTPUT_ROOT=output/
-BINNAME?=step
 
 GORELEASER_BUILD_ID?=default
 ifdef DEBUG
@@ -86,25 +92,25 @@ bootstra%:
 # Build
 #########################################
 
-build: $(PREFIX)bin/$(BINNAME)
+build: $(PREFIX)/$(BINNAME)
 	@echo "Build Complete!"
 
-$(PREFIX)bin/$(BINNAME):
-	$Q mkdir -p $(@D)
+$(PREFIX)/$(BINNAME):
+	$Q mkdir -p $(PREFIX)
 	$Q $(GOOS_OVERRIDE) $(CGO_OVERRIDE) go build \
 		-v \
-	   	-o $(PREFIX)bin/$(BINNAME) \
+	   	-o $(PREFIX)/$(BINNAME) \
 		$(GCFLAGS) $(LDFLAGS) \
 	   	github.com/smallstep/cli/cmd/step
 
 goreleaser:
-	$Q mkdir -p $(@D)
+	$Q mkdir -p $(PREFIX)
 	$Q $(GOOS_OVERRIDE) $(CGO_OVERRIDE) goreleaser build \
 		--id $(GORELEASER_BUILD_ID) \
 	   	--snapshot \
 		--single-target \
 	   	--clean \
-		--output $(PREFIX)bin/$(BINNAME)
+		--output $(PREFIX)/$(BINNAME)
 
 .PHONY: build goreleaser
 
@@ -123,7 +129,7 @@ race:
 
 integrate: integration
 
-integration: bin/$(BINNAME)
+integration: build
 	$Q $(CGO_OVERRIDE) gotestsum -- -tags=integration ./integration/...
 
 .PHONY: integrate integration
@@ -150,14 +156,12 @@ govulncheck:
 # Install
 #########################################
 
-DESTDIR?=/usr/local/
-
-install: $(PREFIX)bin/$(BINNAME)
-	$Q mkdir -p $(DESTDIR)bin/
-	$Q install $(PREFIX)bin/$(BINNAME) $(DESTDIR)bin/$(BINNAME)
+install: $(PREFIX)/$(BINNAME)
+	$Q mkdir -p $(DESTDIR)/
+	$Q install $(PREFIX)/$(BINNAME) $(DESTDIR)/$(BINNAME)
 
 uninstall:
-	$Q rm -f $(DESTDIR)/bin/$(BINNAME)
+	$Q rm -f $(DESTDIR)/$(BINNAME)
 
 .PHONY: install uninstall
 
@@ -166,7 +170,7 @@ uninstall:
 #########################################
 
 clean:
-	$Q rm -f bin/$(BINNAME)
+	$Q rm -f $(PREFIX)/$(BINNAME)
 	$Q rm -rf dist
 
 .PHONY: clean
@@ -182,7 +186,7 @@ define BUNDLE_MAKE
 	# $(2) -- Go Architecture (e.g. amd64, arm, arm64, etc.)
 	# $(3) -- Go ARM architectural family (e.g. 7, 8, etc.)
 	# $(4) -- Parent directory for executables generated by 'make'.
-	$Q GOOS_OVERRIDE='GOOS=$(1) GOARCH=$(2) GOARM=$(3)' PREFIX=$(4) make $(4)bin/$(BINNAME)
+	$Q GOOS_OVERRIDE='GOOS=$(1) GOARCH=$(2) GOARM=$(3)' PREFIX=$(4) make $(4)/$(BINNAME)
 endef
 
 binary-linux-amd64: