From 463e37236c8df0842a1e9b12c187225f77635f10 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Tue, 17 Oct 2017 11:51:09 +0200
Subject: [PATCH] Always run 'bundle config --path'

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f32cd684f5a..086d43dd79a 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,9 @@ build:	.ruby-bundle $(TARGET_SETUP)
 	go install $(GO_LDFLAGS) $(COMMAND_PACKAGES)
 	cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/
 
+BUNDLE_PATH ?= vendor/bundle
 .ruby-bundle:	ruby/Gemfile.lock ruby/Gemfile
-	if test -z "${BUNDLE_PATH}" ; then cd ruby && bundle config --local path vendor/bundle; fi
+	cd ruby && bundle config --local path ${BUNDLE_PATH}
 	cd ruby && bundle install
 	touch $@
 
-- 
GitLab