summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Merry <dev@randomguy3.me.uk>2010-12-13 16:46:54 +0000
committerAlex Merry <dev@randomguy3.me.uk>2010-12-13 16:46:54 +0000
commit63e6c595b87663d899d83708af836ddd5934368a (patch)
treea078dfec3b76de6f14e064e8c639972882c1c312
parent7a94a845ebcaca7b4c28eb33d1104f406ca48594 (diff)
parent912288a60db86a776dd5b5a5ad4fb04607ab500f (diff)
Merge branch 'master' into playlists
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 8138c30..28c0687 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
all:
-INSTALL ?= install
-PYTHON ?= python
-EGREP ?= egrep
+INSTALL = install
+PYTHON = python
+EGREP = egrep
XMLS = $(wildcard spec/*.xml)
TEMPLATES = $(wildcard doc/templates/*)