X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=c47720b809fc07a25982f7e6d3724960e195ea2c;hb=548a47b0ec1040320e56f17cfac71f716785cb95;hp=6ec108c02aa01957ce9c54116cc3630766390fc5;hpb=6b1038b81b5d5824b54376abf7b1e562cde17cb9;p=freeside.git

diff --git a/Makefile b/Makefile
index 6ec108c02..c47720b80 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DB_USER = freeside
@@ -11,18 +11,31 @@ TEMPLATE = asp
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
+#deb, others?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#freebsd
+#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 
+#deb, others?
 INIT_FILE = /etc/init.d/freeside
+#freebsd
+#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
+#deb, others?
 HTTPD_RESTART = /etc/init.d/apache restart
-FREESIDE_RESTART = /etc/init.d/freeside restart
+#freebsd
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
+FREESIDE_RESTART = ${INIT_FILE} restart
+
+#deb, others?
 INSTALLGROUP = root
+#freebsd
+#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-QUEUED_USER=ivan
+QUEUED_USER=fs_queue
 
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
@@ -40,8 +53,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.1beta1
-TAG=freeside_1_4_1beta1
+VERSION=1.5.0pre1
+TAG=freeside_1_5_0pre1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -82,6 +95,7 @@ htmlman:
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
+	chmod a+rx bin/pod2x
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 forcehtmlman:
@@ -170,7 +184,7 @@ upload-docs: forcehtmlman
 	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 release: upload-docs
-	cd /home/ivan/freeside_current
+	cd /home/ivan/freeside
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}