git://git.onelab.eu
/
plewww.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugfix: the slice page was broken when nobody is in slice
[plewww.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
33b5028
..
aa1aed4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-17,7
+17,7
@@
SSHURL:=root@$(PLC):/
SSHCOMMAND:=ssh root@$(PLC)
else
ifdef PLCHOSTLXC
SSHCOMMAND:=ssh root@$(PLC)
else
ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/v
ar/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/v
servers/$(GUESTNAME)
SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
else
ifdef PLCHOSTVS
SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
else
ifdef PLCHOSTVS
@@
-41,12
+41,13
@@
ifeq (,$(SSHURL))
@exit 1
else
+$(RSYNC) planetlab plekit modules $(SSHURL)/var/www/html/
@exit 1
else
+$(RSYNC) planetlab plekit modules $(SSHURL)/var/www/html/
+ +$(RSYNC) drupal-hacks/*.module $(SSHURL)/var/www/html/modules/
endif
compress:
$(foreach file,\
$(shell find . -type f -iname "*.js" | grep -v datepicker.js | grep -v raphael),\
endif
compress:
$(foreach file,\
$(shell find . -type f -iname "*.js" | grep -v datepicker.js | grep -v raphael),\
- $(shell python jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
+ $(shell python
2
jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
@echo "Compressed .js files with jsmin.py"
.PHONY: compress
@echo "Compressed .js files with jsmin.py"
.PHONY: compress