From c87e6cdaf5852215ebe3c5d601e6cd3e15e40814 Mon Sep 17 00:00:00 2001
From: Charlie Drage <charlie@charliedrage.com>
Date: Tue, 29 Nov 2016 09:56:43 -0500
Subject: [PATCH] Switch to 'make bin' instead of 'make binary'

I keep mistyping this when creating the binary as per other projects
that use it commonly (it's usually `make bin` instead of `make binary`).
---
 .travis.yml |  2 +-
 Makefile    | 23 +++++++++++++++++++----
 README.md   |  6 +++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 410abaf7..bd3154ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ script:
   - make test-unit
   
   # make test-cmd requires kompose binary
-  - make binary
+  - make bin
   
   # $GOPATH/bin is in $PATH
   - mkdir -p $GOPATH/bin
diff --git a/Makefile b/Makefile
index 95e61ffd..ba602475 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,18 @@
+
+# Copyright 2016 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 .PHONY: all
 
 KOMPOSE_ENVS := \
@@ -9,15 +24,15 @@ KOMPOSE_ENVS := \
 
 BIND_DIR := bundles
 
-default: binary
+default: bin
 
-all:
+all: validate
 	CGO_ENABLED=1 ./script/make.sh
 
-binary:
+bin:
 	CGO_ENABLED=1 ./script/make.sh binary
 
-binary-cross:
+cross:
 	# CGO_ENABLED=1 ./script/make.sh binary-cross
 	./script/make.sh binary-cross
 
diff --git a/README.md b/README.md
index 5cd385f8..2ec8bf64 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ $ PROG=kompose source script/bash_autocomplete
 You can either build via the Makefile:
 
 ```console
-$ make binary
+$ make bin
 ```
 
 Or `go build`:
@@ -86,10 +86,10 @@ If you have `go` v1.5, it's still good to build `kompose` with the following set
 $ CGO_ENABLED=0 GO15VENDOREXPERIMENT=1 go build -o kompose main.go
 ```
 
-To create a multi-platform binary, use the `binary-cross` command via `make`:
+To create a multi-platform binary, use the `cross` command via `make`:
 
 ```console
-$ make binary-cross
+$ make cross
 ```
 
 ## Contributing and Issues