X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=48b7d7d7345a0334374f8e7b136d40dc3f8c2d90;hp=21aeb4566b2742607821cb4493744d3f0452be5d;hb=f21edcf70602d7f2ea314d65382bd8c40f51d530;hpb=87af741da0dd5f6a76bbb566b4d6c54cd5b15315

diff --git a/Makefile b/Makefile
index 21aeb4566..48b7d7d73 100644
--- a/Makefile
+++ b/Makefile
@@ -6,23 +6,29 @@ 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
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+INIT_FILE = /etc/init.d/freeside
+
 HTTPD_RESTART = /etc/init.d/apache restart
-QUEUED_RESTART = /etc/init.d/freeside restart
+FREESIDE_RESTART = /etc/init.d/freeside restart
+
+INSTALLGROUP = root
 
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION="1.4.0pre12"
-TAG="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"
@@ -74,11 +80,15 @@ install-perl-modules: perl-modules
 	cd FS; \
 	make install UNINST=1
 
-install: install-perl-modules install-docs
+install-init:
+	#[ -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
 
 deploy: install
 	${HTTPD_RESTART}
-	${QUEUED_RESTART}
+	${FREESIDE_RESTART}
 
 create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
@@ -122,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
-	cvs export -r $TAG -d freeside-${VERSION} freeside
+	#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 )'