X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=215ec14a5df6ecdae42b005c902a9d30fdc106a0;hb=34647c32b50ce3b8ee1b6d3d7aef4ba9d0297bdb;hp=c3394779a8a13b9e514244d3863c2494883bbb8a;hpb=9027fa93a91ced6f330627255e7296a792434f6d;p=freeside.git

diff --git a/Makefile b/Makefile
index c3394779a..215ec14a5 100644
--- a/Makefile
+++ b/Makefile
@@ -34,12 +34,19 @@ INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
+#deb
+INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
+#redhat, fedora
+#INIT_INSTALL = /sbin/chkconfig freeside on
+#not necessary (freebsd)
+#INIT_INSTALL = /usr/bin/true
+
 #deb, suse
 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
@@ -102,9 +109,6 @@ help:
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
 	cp -pr httemplate aspdocs
-	perl -p -i -e "\
-	  s/%%%VERSION%%%/${VERSION}/g;\
-	" aspdocs/index.html
 	touch aspdocs
 
 
@@ -114,9 +118,6 @@ masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*
 	( cd masondocs; \
 	  ../bin/masonize; \
 	)
-	perl -p -i -e "\
-	  s/%%%VERSION%%%/${VERSION}/g;\
-	" masondocs/index.html
 	touch masondocs
 
 alldocs: aspdocs masondocs
@@ -163,7 +164,10 @@ install-docs: docs
 perl-modules:
 	cd FS; \
 	[ -e Makefile ] || perl Makefile.PL; \
-	make
+	make; \
+	perl -p -i -e "\
+	  s/%%%VERSION%%%/${VERSION}/g;\
+	" blib/lib/FS.pm
 
 install-perl-modules: perl-modules
 	cd FS; \
@@ -178,9 +182,10 @@ install-init:
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
+	${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" ;\