X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=80d49c4c34a20bf40d2ad6fd1a553c98abde701b;hb=refs%2Fheads%2Ff4f-review;hp=ca83b860125a4b643d399423c09b2ee4c4ffd316;hpb=2723f74db5e910fb83aa90d22042ec9ec5bdec38;p=myslice.git

diff --git a/Makefile b/Makefile
index ca83b860..80d49c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -71,8 +71,9 @@ debian.clean:
 plugins-templates: force
 	@find plugins -type f -name '*.html' 
 local-templates: force
-	#@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),ls -1 $(tmpl)/*;)
-	@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),find $x -type f -name *.html;)
+	@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),find $(tmpl) -maxdepth 2 -type f -name *.html;)
+local-templates2: force
+	@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),ls -1 $(tmpl)/*;)
 
 
 list-templates: plugins-templates local-templates
@@ -80,11 +81,7 @@ list-templates: plugins-templates local-templates
 #################### manage templates for the plugin area
 templates: force
 	@mkdir -p templates
-	@echo "----"
-	@echo $(shell $(MAKE-SILENT) list-templates)
-	@echo "----"
-	@echo $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x))
-	#ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./templates
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),"../$(x)") ./templates
 
 clean-templates templates-clean: force
 	rm -rf ./templates
@@ -113,8 +110,9 @@ ftags: force
 
 #################### sync : push current code on a box running myslice
 # this for now targets deployments based on the debian packaging
-SSHURL:=root@$(MYSLICEBOX):/
-SSHCOMMAND:=ssh root@$(MYSLICEBOX)
+SSHUSER    ?= root
+SSHURL     := $(SSHUSER)@$(MYSLICEBOX):
+SSHCOMMAND := ssh $(SSHUSER)@$(MYSLICEBOX)
 
 ### rsync options
 # the config file should probably not be overridden ??
@@ -166,3 +164,14 @@ ifeq (,$(MYSLICEBOX))
 else
 	+$(SSHCOMMAND) apachectl restart
 endif
+
+#SSHUSER=tparment
+#MYSLICEBOX=srv-diana.inria.fr
+sync-devel:
+ifeq (,$(MYSLICEBOX))
+	@echo "you need to set MYSLICEBOX, like in e.g."
+	@echo "  $(MAKE) MYSLICEBOX=srv-diana.inria.fr "$@""
+	@exit 1
+else
+	+$(RSYNC) --relative $$(git ls-files) $(SSHURL)myslice/
+endif