another simpler, cleaner angle

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 3003d54..4c148c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ python-install:
        chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
        rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
        rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations
-       (cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan)
+       (cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan; ln -s sfaadmin.py sfaadmin)
 
 python-clean: version-clean
        python setup.py clean
@@ -61,6 +61,12 @@ wsdl-clean:
 
 .PHONY: wsdl wsdl-install wsdl-clean
 
+##########
+debian: version
+       $(MAKE) -f Makefile.debian debian
+debian.clean: 
+       $(MAKE) -f Makefile.debian clean
+
 ##########
 tests-install:
        mkdir -p $(DESTDIR)/usr/share/sfa/tests
@@ -114,14 +120,12 @@ signatures:
 # $ run export
 # and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
-
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOST):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 else
 ifdef PLCHOSTVS
@@ -146,11 +150,11 @@ RSYNC_EXCLUDES            := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-CLIENTS = $(shell ls sfa/clientbin/*.py)
+CLIENTS = $(shell ls clientbin/*.py)
 
 BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
        ./sfa/server/sfa-start.py \
-       ./sfa/clientbin/sfaadmin.py \
+       ./clientbin/sfaadmin.py \
        $(CLIENTS)
 
 synclib: synccheck
@@ -164,7 +168,7 @@ syncconfig:
 synctest: synccheck
        +$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 syncrestart: synccheck
-       $(SSHCOMMAND) exec service sfa restart
+       $(SSHCOMMAND) service sfa restart
 
 syncmig:
        +$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/