From 2d972a5f1dec927ef2945822e3403f77c540e4e6 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 4 Mar 2014 17:17:06 -0500
Subject: meh

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ab02026..855d44d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ WEBPMUX ?= webpmux
 CONVERT ?= convert
 APNGASM ?= apngasm
 NPM ?= npm
-UGLIFYJS := node_modules/.bin/uglifyjs
+DUGLIFYJS := node_modules/uglify-js/bin/uglifyjs
+UGLIFYJS ?= $(DUGLIFYJS)
 ifndef MINIMAL
 ZOPFLIPNG ?= zopflipng
 DEFLOPT ?= wine DeflOpt
@@ -177,8 +178,10 @@ else
   endif
 endif
 
+ifeq ($(DUGLIFYJS), $(UGLIFYJS))
 $(UGLIFYJS): package.json
 	$(NPM) update
+endif
 
 # === MISC ===
 
@@ -195,8 +198,9 @@ watch:
 		$(MAKE); \
 	done
 
-# disable default rules, increases `make` speed by 3 seconds
+# disable implicit rules, increases `make` speed by 3 seconds
 MAKEFLAGS=-r
+.SUFFIXES:
 
 .INTERMEDIATE: $(Y4M) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
 .PHONY: video audio images js jshint clean space watch
-- 
cgit v1.2.3-54-g00ecf