From a7269ca8155a1ee5857aed5ae9882b1c122cf878 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 18 Feb 2014 09:51:05 -0500
Subject: stuff

---
 .travis.sh | 6 +++---
 Makefile   | 2 +-
 setup.sh   | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 378746f..725d923 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 
-set -e
+set -e -x
 
-MAKEOPTS="-j$(nproc)"
+MAKEOPTS="-j`nproc`"
 
 case "$1" in
   before_install)
diff --git a/Makefile b/Makefile
index 55d9c63..596cda0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 
 DUMP ?= www/dump
 
-all: .modules video audio images js
+all: modules video audio images js
 
 # === GIT SUBMODULES ===
 modules:
diff --git a/setup.sh b/setup.sh
index f608498..2628341 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-set -e
+if [ -z $MAKEOPTS ]; then
+  MAKEOPTS="-j`nproc`"
+fi
+
+set -e -x
 
 cd $(dirname $0)
 
-- 
cgit v1.2.3-70-g09d2