X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=34259737bba37f8175f4a030e0a66d8c843080ec;hp=54146b42cedb997f45d431107d134c5bc15e4d34;hb=b35b650a6078d645d6f97620f3c79ae941915dd9;hpb=ee35306e0c6757f68ae9120ca4fa52f410125847

diff --git a/Makefile b/Makefile
index 54146b42c..34259737b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,14 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
+<<<<<<< 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
 
@@ -24,17 +29,18 @@ FREESIDE_CONF = /usr/local/etc/freeside
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
+	@echo "                   htmlman"
 	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
 	@echo "                   create-database"
 	@echo "                   clean"
 
-aspdocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
 	cp -pr httemplate aspdocs
 	touch aspdocs
 
-masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
@@ -47,12 +53,23 @@ alldocs: aspdocs masondocs
 docs:
 	make ${TEMPLATE}docs
 
+htmlman:
+	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
+	[ -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
+	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
+
+upload-docs:
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
-	[ ${TEMPLATE} eq asp -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL}
-	[ ${TEMPLATE} eq asp ] && chown -R freeside ${ASP_GLOBAL}
-	[ ${TEMPLATE} eq asp ] && cp htetc/global.asa ${ASP_GLOBAL}
+	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
 
 perl-modules:
 	cd FS; \