less cracktastic version numbering

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index dcd0d0c..215ec14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ INIT_FILE = /etc/init.d/freeside
 #deb
 INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #redhat, fedora
-#INIT_INSTALL = /sbin/chkconfig freeside
+#INIT_INSTALL = /sbin/chkconfig freeside on
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
@@ -46,7 +46,7 @@ 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 10; /usr/local/etc/rc.d/apache.sh start
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop || true; sleep 10; /usr/local/etc/rc.d/apache.sh start
 #openbsd
 #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 10; /usr/sbin/httpd -u -DSSL
 #apache
@@ -185,7 +185,7 @@ install-init:
        ${INIT_INSTALL}
 
 install-selfservice:
-       [ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside
+       [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
        for MACHINE in ${SELFSERVICE_MACHINES}; do \
          scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
          ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\