X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=69725db55ad12a834e53e3de074c31d18643849a;hb=refs%2Fheads%2Ffed4fire;hp=9d850a765dff585c3b0027c18024f64b109a5f2d;hpb=92db172eb967bdfec2f949a1a15592c0409a31ed;p=myslice.git

diff --git a/Makefile b/Makefile
index 9d850a76..69725db5 100644
--- a/Makefile
+++ b/Makefile
@@ -71,14 +71,17 @@ debian.clean:
 plugins-templates: force
 	@find plugins -type f -name '*.html' 
 local-templates: force
+	@$(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
 
 #################### manage templates for the plugin area
 templates: force
-	mkdir -p templates
-	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./templates
+	@mkdir -p templates
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),"../$(x)") ./templates
 
 clean-templates templates-clean: force
 	rm -rf ./templates
@@ -91,7 +94,7 @@ redo-templates: clean-templates templates
 #################### compute emacs tags
 # list files under git but exclude third-party stuff like bootstrap and jquery
 myfiles: force
-	@git ls-files | egrep -v 'insert(_|-)above|third-party/|play/'
+	@git ls-files | egrep -v 'insert(_|-)above|third-party/|to-be-integrated/'
 
 # in general it's right to rely on the contents as reported by git
 tags: force
@@ -116,7 +119,7 @@ SSHCOMMAND:=ssh root@$(MYSLICEBOX)
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc'
 LOCAL_RSYNC_EXCLUDES	+= --exclude '*.sqlite3' --exclude myslice.ini
 LOCAL_RSYNC_EXCLUDES	+= --exclude static --exclude templates --exclude build
-LOCAL_RSYNC_EXCLUDES	+= --exclude to-be-integrated --exclude third-party --exclude 'offline*'
+LOCAL_RSYNC_EXCLUDES	+= --exclude to-be-integrated --exclude third-party 
 # usual excludes
 RSYNC_EXCLUDES		:= --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n 
@@ -148,8 +151,8 @@ ifeq (,$(MYSLICEBOX))
 	@echo "  $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
 	@exit 1
 else
-	+$(RSYNC) ./apache/myslice.conf $(SSHURL)/$(INSTALLED_APACHE)/
-	+$(RSYNC) ./apache/unfold-init-ssl.py $(SSHURL)/$(bindir)/
+	+$(RSYNC) ./apache/unfold.conf $(SSHURL)/$(INSTALLED_APACHE)/
+	+$(RSYNC) ./apache/unfold-init-ssl.sh $(SSHURL)/$(bindir)/
 endif
 
 restart: