X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=768d9cade79bc457976d91d2cd245a08812dfe2d;hb=962ce33ec0f0b5b645d9fd294df17f279cc84ad3;hp=e8abfa647924764bd8f666ec33c298fc79058ac0;hpb=63528107273f1f5de8a83428dbdd70e5f25d3d7f;p=platal.git

diff --git a/Makefile b/Makefile
index e8abfa6..768d9ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+
 # $Id: Makefile,v 1.5 2004/11/25 20:18:39 x99laine Exp $
 ################################################################################
 # definitions
@@ -16,13 +17,13 @@ VCS_FILTER = ! -name .arch-ids ! -name CVS
 
 all: build
 
-build: core banana wiki
+build: core banana wiki jquery
 
 q:
 	@echo -e "Code statistics\n"
 	@sloccount $(filter-out wiki/ spool/, $(wildcard */)) 2> /dev/null | egrep '^[a-z]*:'
 
-%: %.in Makefile
+%: %.in Makefile ChangeLog
 	sed -e 's,@VERSION@,$(VERSION),g' $< > $@
 
 ################################################################################
@@ -32,12 +33,16 @@ q:
 ## core
 ##
 
-core: spool/templates_c include/platal/globals.inc.php
+core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess
 
-spool/templates_c spool/uploads:
+spool/templates_c spool/mails_c spool/uploads:
 	mkdir -p $@
 	chmod o+w $@
 
+htdocs/.htaccess: htdocs/.htaccess.in Makefile
+	@REWRITE_BASE="/~$$(id -un)"; \
+	test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
+	sed -e "s,@REWRITE_BASE@,$$REWRITE_BASE,g" $< > $@
 
 ##
 ## wiki
@@ -65,17 +70,17 @@ htdocs/wiki:
 spool/wiki.d:
 	mkdir -p $@
 	chmod o+w $@
-	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
+	cd $@ && ln -sf ../../include/wiki/wiki.d/* .
 
 
 wiki/cookbook/e-protect.php:
-	cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
+	cd wiki/cookbook && ln -sf ../../include/wiki/e-protect.php
 
 wiki/local/farmconfig.php:
-	cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
+	cd wiki/local/ && ln -sf ../../include/wiki/farmconfig.php
 
 wiki/pub/skins/empty:
-	cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
+	cd wiki/pub/skins/ && ln -sf ../../../include/wiki/empty
 
 
 get-wiki:
@@ -97,6 +102,14 @@ htdocs/images/banana:
 htdocs/css/banana.css:
 	cd $(@D) && ln -sf /usr/share/banana/css/style.css $(@F)
 
+##
+## jquery
+##
+
+jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js
+htdocs/javascript/jquery.js:
+	wget http://jquery.com/src/jquery-latest.pack.js -O $@ -q || ($(RM) $@; exit 1)
+
 ################################################################################
 
 .PHONY: build dist clean wiki build-wiki banana