Permalink
Browse files

Merge branch 'master' into macbindist

  • Loading branch information...
2 parents 57b6319 + b9e0abf commit 92d76c869b43e53e779016915a7853d70634d8b3 Matt Zimmerman committed Mar 16, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 Makefile
View
6 Makefile
@@ -7,7 +7,7 @@ MOCHA = ./node_modules/.bin/mocha
RUNALL = env INTEGRAL_CONFIG=test/config.json $(MOCHA) $(TESTS)
DEFAULT_OPTS = --growl --timeout 500
-all: check_submodules checkdeps build
+all: submodules checkdeps build
@echo
@echo "Looks like everything worked!"
@echo "Get some API keys (https://github.com/LockerProject/Locker/wiki/GettingAPIKeys) and then try running:"
@@ -20,7 +20,7 @@ deps:
@echo
@echo "Go ahead and run 'make'"
-check_submodules:
+submodules:
@if [ -d ./.git -a -f ./.gitmodules -a ! -d ./Apps/dashboardv3/static/common/.git ]; then \
echo "Initializing submodules..."; \
git submodule update --init; \
@@ -62,7 +62,7 @@ DISTFILE=$(SUBDIR).tar.gz
bindist: $(DISTFILE)
-$(DISTFILE):
+$(DISTFILE): submodules
./scripts/build-tarball "$(SUBDIR)" "$@"
# This is the rule that Jenkins runs -mdz 2012-02-04

0 comments on commit 92d76c8

Please sign in to comment.