From ae3180f91994cd6129dbb80144cda4b1abeb6ec0 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sat, 17 Jan 2015 04:55:29 +0900
Subject: Fix CTRL-Y key binding

With tmux-based test cases
---
 src/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 4610e586..eda04040 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,7 @@ VERSION    = $(shell fzf/$(BINARY64) --version)
 RELEASE32  = fzf-$(VERSION)-$(GOOS)_386
 RELEASE64  = fzf-$(VERSION)-$(GOOS)_amd64
 
-all: test release
+all: release
 
 release: build
 	cd fzf && \
@@ -30,13 +30,13 @@ release: build
 	cp $(BINARY64) $(RELEASE64) && tar -czf $(RELEASE64).tgz $(RELEASE64) && \
 	rm $(RELEASE32) $(RELEASE64)
 
-build: fzf/$(BINARY32) fzf/$(BINARY64)
+build: test fzf/$(BINARY32) fzf/$(BINARY64)
 
 test:
 	go get
 	go test -v ./...
 
-install: $(BINDIR)/fzf
+install: build $(BINDIR)/fzf
 
 uninstall:
 	rm -f $(BINDIR)/fzf $(BINDIR)/$(BINARY64)
-- 
cgit v1.2.3


From 1990f3c992b7825dce6c959e2b4f26429c148cc9 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sat, 17 Jan 2015 10:51:39 +0900
Subject: Do not build i386 binary on Travis CI to speed up the process

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index eda04040..2604c3ba 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,7 +36,7 @@ test:
 	go get
 	go test -v ./...
 
-install: build $(BINDIR)/fzf
+install: $(BINDIR)/fzf
 
 uninstall:
 	rm -f $(BINDIR)/fzf $(BINDIR)/$(BINARY64)
-- 
cgit v1.2.3