final make release?

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 21aeb45..9022d2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,18 @@ 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
 
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION="1.4.0pre12"
-TAG="1_4_0_PRE12"
+VERSION=1.4.0pre12
+TAG=freeside_1_4_0_pre12
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -74,11 +76,14 @@ 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 root -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 +127,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 )'