Fix emails on payment return

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 07748fe..a32cc3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,11 @@
+
 # $Id: Makefile,v 1.5 2004/11/25 20:18:39 x99laine Exp $
 ################################################################################
 # definitions
 
-VERSION := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/\t.*//;s/ .*//")
+VERSNUM := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/ .*//")
+VERSTAG := $(shell grep VERSION ChangeLog | head -1 | grep 'XX' > /dev/null 2> /dev/null && echo 'beta')
+VERSION = $(VERSNUM)$(VERSTAG)
 
 PKG_NAME = platal
 PKG_DIST = $(PKG_NAME)-$(VERSION)
@@ -16,7 +19,7 @@ VCS_FILTER = ! -name .arch-ids ! -name CVS
 
 all: build
 
-build: core banana wiki
+build: core banana wiki jquery
 
 q:
        @echo -e "Code statistics\n"
@@ -32,12 +35,16 @@ q:
 ## core
 ##
 
-core: spool/templates_c include/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
@@ -97,6 +104,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