X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=0d16f3510f2b8125a76e64ad40ecfb7eb32a4ad0;hb=a851e7c263db2e7040bd2e29a9bf44b80bd8eba9;hp=4a2afd000851726b3bcbbdf36bdd549b4219c8f1;hpb=f5a81134be779b26688d3d4703840f3b038ca2f7;p=freeside.git

diff --git a/Makefile b/Makefile
index 4a2afd000..0d16f3510 100644
--- a/Makefile
+++ b/Makefile
@@ -15,21 +15,21 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat
+#redhat, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 
-#deb, redhat, others?
+#deb, redhat, mandrake, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat
+#redhat, 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
@@ -38,9 +38,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, others?
+#deb, redhat, mandrake, others?
 INSTALLGROUP = root
-#freebsd,openbsd
+#freebsd, openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
@@ -58,8 +58,8 @@ SELFSERVICE_MACHINE = 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"
@@ -164,7 +164,8 @@ create-config: install-perl-modules
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	rm -rf conf/registries #old dirs just won't go away
-	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	#cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
 	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
@@ -184,11 +185,12 @@ 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 update-webdemo
 release: upload-docs
-	cd /home/ivan/freeside
+	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -200,7 +202,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 )'