X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=node_ssh%2FMakefile;h=344ea3c82eee686551910e2c6177f87e83956e0d;hb=eeba8e303edbfc5e926767ba22294beda642ecba;hp=b3adec42f72b96eaf00bdf0358a7a36c5531226d;hpb=5b60ae066e59f5fb41367366674a062389edd570;p=tests.git

diff --git a/node_ssh/Makefile b/node_ssh/Makefile
index b3adec4..344ea3c 100644
--- a/node_ssh/Makefile
+++ b/node_ssh/Makefile
@@ -2,6 +2,8 @@ CODE = nst.py
 
 CONFIG = nst_config
 
+SSH_CONFIG = ssh_config
+
 CRON = nst.cron
 
 CROND = /etc/init.d/crond
@@ -9,30 +11,39 @@ CROND = /etc/init.d/crond
 APPS = nst
 
 datadir := /usr/share
-appdir := /planetlab/tests/nst
+vardir := /var/lib
+appdir := /planetlab/tests/node-ssh
 
 all: $(APPS)
 
-nst: $(CODE) $(CONFIG) $(CRON) data
+nst: $(CODE) config cron data
 	install -D -m 755 nst.py $(datadir)/$(appdir)/$(CODE)
-	install -D -m 750 nst_config $(datadir)/$(appdir)/$(CONFIG)
-	install -D -m 755 nst.cron /etc/cron.d/$(CRON)
 
 	# create symlink to executable	
 	ln -s $(datadir)/$(appdir)/$(CODE) /usr/bin/nst
 
-        # reload cron
+cron: $(CRON)
+	install -D -m 644 $(CRON) /etc/cron.d/$(CRON)
+	
+	# restart cron
 	$(CROND) restart
 
+config: $(CONFIG)
+	install -D -m 640 $(CONFIG) $(datadir)/$(appdir)/$(CONFIG)
+	install -D -m 644 $(SSH_CONFIG) /root/.ssh/config
 
 data:
-	install -d -m 755 $(datadir)/$(appdir)/plots/	
-	install -d -m 755 $(datadir)/$(appdir)/data/
-clean:
+	install -d -m 755 $(vardir)/$(appdir)/plots/	
+	install -d -m 755 $(vardir)/$(appdir)/data/
+
+cleandata:
+	rm -Rf $(vardir)/$(appdir)
+
+clean: cleandata
 	rm -Rf $(datadir)/$(appdir)
-	rm -rf /etc/cron.d/$(CRON)
 	rm -rf /usr/bin/nst
-
+	rm -rf /root/.ssh/config
+	rm -rf /etc/cron.d/$(CRON)
 	$(CROND) restart
 
-.PHONY: clean data
+.PHONY: clean data config cron nst