From 97d1f03a87584fa7aba163b22451a22ae4877e08 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sat, 11 Apr 2015 17:31:01 -0700 Subject: [PATCH] Fix build for travis --- Makefile | 6 ++---- buildscripts/checkdeps.sh | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 0f6836904..8526bdfb1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -MINIOPATH=$(GOPATH)/src/github.com/minio-io/minio - all: getdeps install checkdeps: @@ -7,8 +5,8 @@ checkdeps: @(env bash $(PWD)/buildscripts/checkdeps.sh) checkgopath: - @echo "Checking if project is at ${MINIOPATH}" - @if [ ! -d ${MINIOPATH} ]; then echo "Project not found in $GOPATH, please follow instructions provided at https://github.com/Minio-io/minio/blob/master/CONTRIBUTING.md#setup-your-minio-github-repository" && exit 1; fi + @echo "Checking if project is at ${GOPATH}" + @for mcpath in $(echo ${GOPATH} | sed 's/:/\n/g' | grep -v Godeps); do if [ ! -d ${mcpath}/src/github.com/minio-io/minio ]; then echo "Project not found in ${mcpath}, please follow instructions provided at https://github.com/Minio-io/minio/blob/master/CONTRIBUTING.md#setup-your-minio-github-repository" && exit 1; fi done getdeps: checkdeps checkgopath @go get github.com/minio-io/godep && echo "Installed godep:" diff --git a/buildscripts/checkdeps.sh b/buildscripts/checkdeps.sh index 12e30a6fb..46c5372a7 100644 --- a/buildscripts/checkdeps.sh +++ b/buildscripts/checkdeps.sh @@ -159,10 +159,6 @@ check_deps() { MISSING="${MISSING} yasm(1.2.0)" fi - env mkdocs help >/dev/null 2>&1 - if [ $? -ne 0 ]; then - MISSING="${MISSING} mkdocs" - fi } main() {