From 34f16e5b7ddf18cae15ba646583c492ed8437e73 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Fri, 2 Jun 2017 18:19:21 +0900
Subject: [PATCH] Fix Makefile and install script for the new project layout
---
Makefile | 20 ++++++++++----------
install | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index f2426e87..5c15f69d 100644
--- a/Makefile
+++ b/Makefile
@@ -92,16 +92,16 @@ release-all: clean test
$(SRC_LINK):
mkdir -p $(shell dirname $(SRC_LINK))
- ln -s $(ROOT_DIR)/src $(SRC_LINK)
+ ln -sf $(ROOT_DIR)/src $(SRC_LINK)
$(VENDOR_LINK):
mkdir -p $(shell dirname $(VENDOR_LINK))
- ln -s $(ROOT_DIR)/vendor $(VENDOR_LINK)
+ ln -sf $(ROOT_DIR)/vendor $(VENDOR_LINK)
-$(GLIDE_LOCK): $(GLIDE_YAML)
+vendor: $(GLIDE_YAML)
go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@
-test: $(SOURCES)
+test: $(SOURCES) vendor
SHELL=/bin/sh GOOS= go test -v -tags "$(TAGS)" \
github.com/junegunn/fzf/src \
github.com/junegunn/fzf/src/algo \
@@ -113,23 +113,23 @@ install: bin/fzf
clean:
rm -rf target
-target/$(BINARY32): $(SOURCES)
+target/$(BINARY32): $(SOURCES) vendor
GOARCH=386 go build $(BUILD_FLAGS) -o $@
-target/$(BINARY64): $(SOURCES)
+target/$(BINARY64): $(SOURCES) vendor
GOARCH=amd64 go build $(BUILD_FLAGS) -o $@
# https://github.com/golang/go/wiki/GoArm
-target/$(BINARYARM5): $(SOURCES)
+target/$(BINARYARM5): $(SOURCES) vendor
GOARCH=arm GOARM=5 go build $(BUILD_FLAGS) -o $@
-target/$(BINARYARM6): $(SOURCES)
+target/$(BINARYARM6): $(SOURCES) vendor
GOARCH=arm GOARM=6 go build $(BUILD_FLAGS) -o $@
-target/$(BINARYARM7): $(SOURCES)
+target/$(BINARYARM7): $(SOURCES) vendor
GOARCH=arm GOARM=7 go build $(BUILD_FLAGS) -o $@
-target/$(BINARYARM8): $(SOURCES)
+target/$(BINARYARM8): $(SOURCES) vendor
GOARCH=arm64 go build $(BUILD_FLAGS) -o $@
bin/fzf: target/$(BINARY) | bin
diff --git a/install b/install
index 516c4cb5..7c3b1f32 100755
--- a/install
+++ b/install
@@ -169,12 +169,12 @@ if [ -n "$binary_error" ]; then
echo " - $binary_error !!!"
fi
if command -v go > /dev/null; then
- echo -n "Building binary (go get -u github.com/junegunn/fzf/src/fzf) ... "
+ echo -n "Building binary (go get -u github.com/junegunn/fzf) ... "
if [ -z "${GOPATH-}" ]; then
export GOPATH="${TMPDIR:-/tmp}/fzf-gopath"
mkdir -p "$GOPATH"
fi
- if go get -u github.com/junegunn/fzf/src/fzf; then
+ if go get -u github.com/junegunn/fzf; then
echo "OK"
cp "$GOPATH/bin/fzf" "$fzf_base/bin/"
else
--
GitLab