From 4da506408edc02607ac3827c7c09ab6a6c8cf0b8 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 25 Mar 2014 22:36:42 -0400
Subject: bleh

---
 .travis.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to '.travis.sh')

diff --git a/.travis.sh b/.travis.sh
index 66faac3..131f73f 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -8,7 +8,7 @@ case "$1" in
     sudo service mysql stop
     sudo apt-get update -qq
 
-    curl http://nodejs.org/dist/node-latest.tar.gz | tar -xz
+    curl http://ftpmirror.gnu.org/make/make-4.0.tar.bz2 | tar -xj
     curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz
     curl -L http://downloads.sourceforge.net/project/opencore-amr/fdk-aac/fdk-aac-0.1.3.tar.gz | tar -xz
     curl http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz | tar -xz
@@ -27,6 +27,13 @@ case "$1" in
     MAKEOPTS="-s ${MAKEOPTS}"
     sudo apt-get install --no-install-recommends -qq libtheora-dev libx264-dev nginx yasm
 
+    cd make-4.0
+    ./configure --disable-dependency-tracking --quiet
+    make $MAKEOPTS >/dev/null
+    sudo make $MAKEOPTS install >/dev/null
+    cd ..
+    rm -rf make-4.0
+
     cd libwebp-0.4.0
     sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure
     ac_cv_header_gif_lib_h=no \
@@ -38,13 +45,6 @@ case "$1" in
     cd ..
     rm -rf libwebp-0.4.0
 
-    cd node-v*
-    ./configure --openssl-use-sys --shared-zlib
-    make $MAKEOPTS >/dev/null
-    sudo python tools/install.py install >/dev/null
-    cd ..
-    rm -rf node-v*
-
     cd fdk-aac-0.1.3
     ./configure --disable-shared --disable-dependency-tracking --quiet
     make $MAKEOPTS >/dev/null
-- 
cgit v1.2.3-54-g00ecf