summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-12-10 12:36:18 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-12-10 12:36:18 -0500
commit764666055f85820fb2a86638c077b997334179a3 (patch)
tree866a2004998ace44844899366aa76e5f8e1d5527
parent497777ba511a3bc15013cc436581da2f8202ed2c (diff)
parentbe3e54f9ebfa05aa5abd4cac8308e8426ec028af (diff)
Merge ../twentyeleven-child
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 550c18b..9e03e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,13 @@ PATCH = patch
SASS = sass
PHP = $(call pick,php5 php)
PNGCRUSH = $(call pick,pngcrush cp)
+
+WGET = $(call pick,wget curl)
+ifeq ($(notdir $(WGET)),wget)
+WGETFLAGS = -O-
+endif
+WGET_OUTFLAG = >
+
SVG2PNG = $(call pick,rsvg-convert convert)
ifeq ($(notdir $(SVG2PNG)),rsvg-convert)
SVG2PNG_OUTFLAG = -o