fix travis stuff

2 files changed, 5 insertions, 15 deletions

diff --git a/.travis.sh b/.travis.sh
index dc3c48a..66faac3 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -25,7 +25,7 @@ case "$1" in
     ;;
   install)
     MAKEOPTS="-s ${MAKEOPTS}"
-    sudo apt-get install -qq libtheora-dev libx264-dev nginx yasm
+    sudo apt-get install --no-install-recommends -qq libtheora-dev libx264-dev nginx yasm
 
     cd libwebp-0.4.0
     sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure
@@ -45,8 +45,6 @@ case "$1" in
     cd ..
     rm -rf node-v*
 
-    sudo npm install -g uglify-js
-
     cd fdk-aac-0.1.3
     ./configure --disable-shared --disable-dependency-tracking --quiet
     make $MAKEOPTS >/dev/null
@@ -75,18 +73,9 @@ case "$1" in
     cd ..
     rm -rf ffmpeg
 
-    patch -o - apngasm.c | gcc -x c -o apngasm -Wall $CFLAGS - $(pkg-config --libs libpng --libs zlib) <<EOF
-@@ -29,6 +29,7 @@
-  */

- #include <stdio.h>

- #include <stdlib.h>

-+#include <string.h>

- #include "png.h"     /* original (unpatched) libpng is ok */

- #include "zlib.h"

- 

-EOF
+    sed -e "29a#include <string.h>\r\n" apngasm.c | gcc -x c -o apngasm -Wall $CFLAGS - $(pkg-config --libs libpng --libs zlib)
     sudo install -c -m755 apngasm /usr/local/bin
-    rm apngasm apngasm.c
+    rm apngasm*
 
     curl https://raw.github.com/Lattyware/unrpa/master/unrpa | python2 - -p www/dump -m data.rpa
     rm data.rpa
diff --git a/Makefile b/Makefile
index 3d854ca..72eb70c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ WEBPMUX ?= webpmux
 CONVERT ?= convert
 APNGASM ?= apngasm
 NPM ?= npm
-DUGLIFYJS := node_modules/uglify-js/bin/uglifyjs
+DUGLIFYJS := node_modules/.bin/uglifyjs
 UGLIFYJS ?= $(DUGLIFYJS)
 #PACKR ?= packr
 #CLOSURE_COMPILER ?= java -jar compiler.jar
@@ -183,6 +183,7 @@ endif
 ifeq ($(DUGLIFYJS), $(UGLIFYJS))
 $(UGLIFYJS): package.json
 	$(NPM) update
+	touch "$@"
 endif
 
 # === MISC ===