X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=47b85ab0438727a405c888504e991f9d7f58e663;hb=c76934de8c83184f634be41f12c2bb6e6cd638f6;hp=b97142734d98c35d1f7a719261b493d1a832b697;hpb=0f6dcbb5c3e51dc9caa8fe44d03991ad998f8319;p=freeside.git

diff --git a/Makefile b/Makefile
index b97142734..47b85ab04 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
@@ -35,13 +35,16 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
+SELFSERVICE_USER = nostart
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre1
-TAG=freeside_1_5_0pre1
+VERSION=1.4.1beta6
+TAG=freeside_1_4_1beta6
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -82,6 +85,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:
@@ -166,11 +170,11 @@ clean:
 #these are probably only useful if you're me...
 
 upload-docs: forcehtmlman
-	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
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/docs
 
-release: upload-docs
-	cd /home/ivan/freeside
+release: upload-docs update-webdemo
+	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -182,7 +186,7 @@ release: upload-docs
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -r FREESIDE_1_4_BRANCH -d -P )'
 	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
 	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'