Merge branch 'platal-0.9.16'

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index e0480fa..7b62aeb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,11 @@ PKG_DIRS = configs htdocs include install.d plugins po scripts templates upgrade
 
 VCS_FILTER = ! -name .arch-ids ! -name CVS
 
+define download
+@echo "Downloading $@ from $(DOWNLOAD_SRC)"
+wget $(DOWNLOAD_SRC) -O $@ -q || ($(RM) $@; exit 1)
+endef
+
 ################################################################################
 # global targets
 
@@ -37,16 +42,12 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf
+core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
 
-spool/templates_c spool/mails_c spool/uploads spool/conf spool/uploads/temp:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
        mkdir -p $@
        chmod o+w $@
 
-spool/uploads/temp/.htaccess: spool/uploads/temp Makefile
-       echo "Order deny,allow" > $@
-       echo "Deny from all" >> $@
-
 htdocs/.htaccess: htdocs/.htaccess.in Makefile
        @REWRITE_BASE="/~$$(id -un)"; \
        test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
@@ -68,7 +69,7 @@ wiki: get-wiki build-wiki
 
 build-wiki: $(WIKI_NEEDS) | get-wiki
 
-htdocs/uploads: spool/uploads/temp/.htaccess
+htdocs/uploads:
        cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
@@ -105,13 +106,13 @@ get-wiki:
 
 banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
 htdocs/images/banana:
-       cd $(@D) && ln -sf $(BANANA)/img $(@F)
+       cd $(@D) && ln -snf $(BANANA)/img $(@F)
 
 htdocs/css/banana.css:
-       cd $(@D) && ln -sf $(BANANA)/css/style.css $(@F)
+       cd $(@D) && ln -snf $(BANANA)/css/style.css $(@F)
 
 include/banana/banana.inc.php:
-       cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -sf {} . ";"
+       cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -snf {} . ";"
 
 
 
@@ -119,11 +120,24 @@ include/banana/banana.inc.php:
 ## jquery
 ##
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js
+JQUERY_PLUGINS=color
+JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
+
+jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES)
+
+htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.pack.js
 htdocs/javascript/jquery.js:
-       wget http://jquery.com/src/jquery-latest.pack.js -O $@ -q || ($(RM) $@; exit 1)
+       @$(download)
+
+htdocs/javascript/jquery.autocomplete.js: DOWNLOAD_SRC = http://jquery-autocomplete.googlecode.com/svn/trunk/jquery.autocomplete.js
+htdocs/javascript/jquery.autocomplete.js:
+       @$(download)
+
+$(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
+$(JQUERY_PLUGINS_PATHES):
+       @$(download)
 
 ################################################################################
 
-.PHONY: build dist clean wiki build-wiki banana
+.PHONY: build dist clean wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http*