Merge commit 'origin/fusionax' into account

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index ac0c434..446aedd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -118,20 +118,20 @@ get-wiki:
 openid: get-openid spool/openid/store
 
 # There is no obvious way to automatically use the latest version
+OPENID_VERSION = 2.1.3
 get-openid:
        @if ! test -d include/Auth; then                                  \
-           wget http://openidenabled.com/files/php-openid/packages/php-openid-2.1.2.tar.bz2; \
-           tar -xjf php-openid-2.1.2.tar.bz2;                            \
-           mv php-openid-2.1.2/Auth include/;                            \
-           rm php-openid-2.1.2.tar.bz2;                                  \
-           rm -r php-openid-2.1.2;                                       \
+           wget http://openidenabled.com/files/php-openid/packages/php-openid-$(OPENID_VERSION).tar.bz2; \
+           tar -xjf php-openid-$(OPENID_VERSION).tar.bz2;                \
+           mv php-openid-$(OPENID_VERSION)/Auth include/;                \
+           rm php-openid-$(OPENID_VERSION).tar.bz2;                      \
+           rm -r php-openid-$(OPENID_VERSION);                           \
        fi
 
 spool/openid/store:
        mkdir -p $@
        chmod o+w $@
 
-
 ##
 ## banana
 ##
@@ -167,16 +167,15 @@ JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQ
 JQUERY_UI=core tabs
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/ui.,$(addsuffix .js,$(JQUERY_UI)))
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
+# TODO: jquery.autocomplete.js should rather be downloaded from an official source. The issue
+# is that the version we use is not available anymore on the Internet, and the latest version
+# we could use is not backward compatible with our current code.
+jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
 
 htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
        @$(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)