From 7749ec9deb1432ed52f75660096ce962a6e572a0 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Wed, 28 Jan 2015 11:01:17 -0200
Subject: [PATCH] fix Makefile again

---
 Makefile |  9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d5baa26..c477109 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ TARBALL = noosfero-deps-$(VERSION).tar.gz
 PREFIX = /var
 WGET = wget
 NOOSFERO_BRANCH = master
-BUNDLE_OPTS = --verbose --without='development test cucumber' --deployment
+BUNDLE_OPTS = --verbose --without='development test cucumber'
 
 all:
-	bundle install $(BUNDLE_OPTS) --local
+	bundle install $(BUNDLE_OPTS) --local --deployment
 	grep -rl '/usr/local/bin/ruby' vendor/bundle/ruby/gems/*/ | xargs --no-run-if-empty sed -i -e '1,2 s|.*|#!/usr/bin/env ruby|'
 
 dist: $(TARBALL)
@@ -23,7 +23,10 @@ install: all
 
 update: clean
 	$(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile
-	bundle install $(BUNDLE_OPTS)
+	$(RM) Gemfile.lock
+	bundle install $(BUNDLE_OPTS) --path vendor/bundle
+	mkdir -p vendor/cache
+	rsync -avp --delete --quiet vendor/bundle/*/*/cache/ vendor/cache/
 
 clean:
 	$(RM) -r .bundle/ vendor/bundle/ $(TARBALL)
--
libgit2 0.21.2