git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto Validation of PLE users using MyPLC API based on the email instead of tweaking...
[unfold.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
473e3d7
..
69725db
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-71,14
+71,17
@@
debian.clean:
plugins-templates: force
@find plugins -type f -name '*.html'
local-templates: force
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)/*;)
@$(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
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
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
#################### 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
# in general it's right to rely on the contents as reported by git
tags: force
@@
-148,7
+151,7
@@
ifeq (,$(MYSLICEBOX))
@echo " $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
@exit 1
else
@echo " $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
@exit 1
else
- +$(RSYNC) ./apache/
myslice
.conf $(SSHURL)/$(INSTALLED_APACHE)/
+ +$(RSYNC) ./apache/
unfold
.conf $(SSHURL)/$(INSTALLED_APACHE)/
+$(RSYNC) ./apache/unfold-init-ssl.sh $(SSHURL)/$(bindir)/
endif
+$(RSYNC) ./apache/unfold-init-ssl.sh $(SSHURL)/$(bindir)/
endif