X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=48b7d7d7345a0334374f8e7b136d40dc3f8c2d90;hp=826e74f60ca13aa874bf0ad99c458c4500495d47;hb=f21edcf70602d7f2ea314d65382bd8c40f51d530;hpb=79359dfa599329e448a1614dac7dab01cfd1b3df

diff --git a/Makefile b/Makefile
index 826e74f60..48b7d7d73 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
@@ -18,13 +18,17 @@ INIT_FILE = /etc/init.d/freeside
 HTTPD_RESTART = /etc/init.d/apache restart
 FREESIDE_RESTART = /etc/init.d/freeside restart
 
+INSTALLGROUP = root
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0pre12
-TAG=freeside_1_4_0_pre12
+VERSION=1.4.0pre13
+TAG=freeside_1_4_0_pre13
+#VERSION=1.4.0beta1
+#TAG=freeside_1_4_0_beta1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -77,7 +81,8 @@ install-perl-modules: perl-modules
 	make install UNINST=1
 
 install-init:
-	[ -e ${INIT_FILE} ] || install -o root -g root -m 711 init.d/freeside-init ${INIT_FILE}
+	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
 
@@ -127,13 +132,15 @@ upload-docs:
 
 release: upload-docs
 	cd /home/ivan/freeside_current
-	cvs tag ${TAG}
+	#cvs tag ${TAG}
+	cvs tag -F ${TAG}
 
-	cd /home/ivan
+	#cd /home/ivan
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-	scp freeside-${VERSION} ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
 	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'