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

diff --git a/Makefile b/Makefile
index b2b2fcdbc..47b85ab04 100644
--- a/Makefile
+++ b/Makefile
@@ -11,31 +11,18 @@ 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
-#freebsd
-#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
+FREESIDE_RESTART = /etc/init.d/freeside restart
 
-FREESIDE_RESTART = ${INIT_FILE} restart
-
-#deb, others?
 INSTALLGROUP = root
-#freebsd
-#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
-QUEUED_USER=fs_queue
+QUEUED_USER=ivan
 
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
@@ -48,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"
@@ -95,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:
@@ -179,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}
 
@@ -195,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 )'