trading in tar for rsync for improved vpopmail support

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 0f86b49..3425973 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,14 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
+<<<<<<< Makefile
+#TEMPLATE = asp
+#mason's a bit dodgy still
+TEMPLATE = mason
+=======
 TEMPLATE = asp
 #TEMPLATE = mason
+>>>>>>> 1.27
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
@@ -52,7 +58,7 @@ htmlman:
        [ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
        [ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
        [ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-       bin/pod2x
+       [ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 upload-docs:
        ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs