X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=34259737bba37f8175f4a030e0a66d8c843080ec;hp=0f86b49d252558e177ba017d0e5c99ded1830119;hb=b35b650a6078d645d6f97620f3c79ae941915dd9;hpb=58b6cf13486080bae2136b13b421db6c9163368e

diff --git a/Makefile b/Makefile
index 0f86b49d2..34259737b 100644
--- 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