Makefile in rimless-0.3.0 vs Makefile in rimless-1.0.0

- old
+ new

@@ -24,16 +24,17 @@ MKDIR ?= mkdir RM ?= rm XARGS ?= xargs # Container binaries -BUNDLE ?= bundle APPRAISAL ?= appraisal +BUNDLE ?= bundle +GEM ?= gem RAKE ?= rake -YARD ?= yard RAKE ?= rake RUBOCOP ?= rubocop +YARD ?= yard # Files GEMFILES ?= $(subst _,-,$(patsubst $(GEMFILES_DIR)/%.gemfile,%,\ $(wildcard $(GEMFILES_DIR)/*.gemfile))) TEST_GEMFILES := $(GEMFILES:%=test-%) @@ -73,9 +74,11 @@ install: # Install the dependencies @$(MKDIR) -p $(VENDOR_DIR) @$(call run-shell,$(BUNDLE) check || $(BUNDLE) install --path $(VENDOR_DIR)) + @$(call run-shell,GEM_HOME=vendor/bundle/ruby/$${RUBY_MAJOR}.0 \ + $(GEM) install bundler -v "~> 1.0") @$(call run-shell,$(BUNDLE) exec $(APPRAISAL) install) update: install # Install the dependencies @$(MKDIR) -p $(VENDOR_DIR)