X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=8baee0280f20be747c216509f907237c398be8fc;hb=749b93fa6cf4c397603fb2b1ee17e2691c28a15e;hp=42f1b85f19e79539ecfce2e1fcea884869db6dd2;hpb=6b54ceeb39da7915624bbcac63fb16e463916709;p=freeside.git

diff --git a/Makefile b/Makefile
index 42f1b85f1..8baee0280 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat, mandrake
+#redhat, fedora, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
@@ -24,14 +24,14 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #suse
 #FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat, mandrake
+#redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
@@ -40,7 +40,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
@@ -61,8 +61,8 @@ SELFSERVICE_MACHINES = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre4
-TAG=freeside_1_5_0pre4
+VERSION=1.4.2beta1
+TAG=freeside_1_4_2beta1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -70,7 +70,6 @@ help:
 	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
 	@echo "                   create-database"
-	@echo "                   configure-rt create-rt"
 	@echo "                   clean"
 
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
@@ -184,28 +183,6 @@ create-config: install-perl-modules
 	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
-configure-rt:
-	cd rt; \
-	cp config.layout.in config.layout; \
-	perl -p -i -e "\
-	  s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;\
-	" config.layout
-	./configure --with-layout=Freeside\
-	            --masonstatedir=${MASONDATA} \
-	            --with-db-type=Pg \
-	            --with-db-database=freeside \
-	            --with-db-rt-user=${DB_USER} \
-	            --with-db-rt-pass=${DB_PASSWORD} \
-	            --with-web-user=freeside \
-	            --with-web-group=www
-
-create-rt: configure-rt
-	cd rt; make install
-	rt/sbin/rt-initialize-database --action schema
-	rt/sbin/rt-initialize-database --action insert_initial
-	rt/sbin/rt-initialize-database --action insert --datafile rt/etc/initialdata
-
-
 clean:
 	rm -rf aspdocs masondocs
 	cd FS; \
@@ -214,11 +191,12 @@ clean:
 #these are probably only useful if you're me...
 
 upload-docs: forcehtmlman
-	ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/devdocs
+	ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs
 
+#release: upload-docs update-webdemo
 release: upload-docs
-	cd /home/ivan/freeside
+	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -230,7 +208,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 )'