diff --git a/Makefile b/Makefile index c447982..763d457 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,10 @@ TARBALL = noosfero-deps-$(VERSION).tar.gz PREFIX = /usr WGET = wget NOOSFERO_BRANCH = master -BUNDLE_OPTS = --verbose --without='development test' +BUNDLE_OPTS = --verbose --without='development test cucumber' --deployment all: - mkdir -p vendor/prototype_legacy_helper - bundle install $(BUNDLE_OPTS) --local --deployment + bundle install $(BUNDLE_OPTS) --local 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) @@ -17,7 +16,6 @@ $(TARBALL): install: all mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor - mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor/prototype_legacy_helper install -m 0644 Gemfile $(DESTDIR)$(PREFIX)/lib/noosfero install -m 0644 Gemfile.lock $(DESTDIR)$(PREFIX)/lib/noosfero cp -r .bundle $(DESTDIR)$(PREFIX)/lib/noosfero/.bundle @@ -25,7 +23,7 @@ install: all update: clean $(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile - bundle install $(BUNDLE_OPTS) --path vendor/bundle + bundle install $(BUNDLE_OPTS) clean: $(RM) -r .bundle/ vendor/bundle/ $(TARBALL) diff --git a/vendor/prototype_legacy_helper/.gitkeep b/vendor/prototype_legacy_helper/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/vendor/prototype_legacy_helper/.gitkeep -- libgit2 0.21.2