From ca6e158fc825476eaf6e272e857bf8e9a8ac287a Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Sat, 6 Mar 2010 23:29:01 -0700
Subject: [PATCH] Make setup.py the last install action

I do this so I can install as not root, and get
everything else before setup fails
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3b3f988..a5e3f9a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ install: base-install $(INSTALL_TARGETS)
 	echo 'BIN = "$(BIN)"' >> ctf/paths.py
 	echo 'SBIN = "$(SBIN)"' >> ctf/paths.py
 	echo 'BASE_URL = "$(BASE_URL)"' >> ctf/paths.py
-	python setup.py install
 
 	install bin/pointscli $(BIN)
 	install bin/in.pointsd bin/in.flagd \
@@ -56,6 +55,8 @@ install: base-install $(INSTALL_TARGETS)
 	touch $(VAR)/disabled/skynet
 	touch $(VAR)/disabled/survey
 
+	python setup.py install
+
 
 base-install:
 	install --directory $(LIB) $(BIN) $(SBIN)