X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=92a865042caee989576251edb339486db49568bd;hp=ef34915d2c68c1cd957662ac720f96bd9d99e38f;hb=649ceeca76084d16d22013124bd7f80f053d75c4;hpb=8bbd039705bd2345d250788616ce17051a25fdb9

diff --git a/Makefile b/Makefile
index ef34915d2..92a865042 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 #!/usr/bin/make
 
+#solaris and perhaps other very weirdass /bin/sh
+#SHELL="/bin/ksh"
+
 DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
@@ -36,11 +39,11 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #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
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 10; /usr/local/etc/rc.d/apache.sh start
 #openbsd
-#HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 1; /usr/sbin/httpd -u -DSSL
+#HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 10; /usr/sbin/httpd -u -DSSL
 #apache
-#HTTPD_RESTART = /usr/local/apache/bin/apachectl restart
+#HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -81,8 +84,8 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-VERSION=1.5.0pre4
-TAG=freeside_1_5_0pre4
+VERSION=1.5.0pre6
+TAG=freeside_1_5_0pre6
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -186,7 +189,7 @@ install-selfservice:
 
 update-selfservice:
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
-	  rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
+	  RSYNC_RSH=ssh rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done