updates from 1.5 branch

diff --git a/Makefile b/Makefile
index c48f5e9..5f45722 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,14 +13,27 @@ ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 MASON_HANDLER = /usr/local/etc/freeside/handler.pl
 MASONDATA = /usr/local/etc/freeside/masondata
 
+#deb, others?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#freebsd
+#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 
+#deb, others?
 INIT_FILE = /etc/init.d/freeside
+#freebsd
+#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
+#deb, others?
 HTTPD_RESTART = /etc/init.d/apache restart
-FREESIDE_RESTART = /etc/init.d/freeside restart
+#freebsd
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
+FREESIDE_RESTART = ${INIT_FILE} restart
+
+#deb, others?
 INSTALLGROUP = root
+#freebsd
+#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start