Make setup.py the last install action

I do this so I can install as not root, and get
everything else before setup fails
This commit is contained in:
Neale Pickett 2010-03-06 23:29:01 -07:00
parent bd53cab933
commit ca6e158fc8
1 changed files with 2 additions and 1 deletions

View File

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