[freeside-commits] freeside Makefile,1.145.2.14,1.145.2.15

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv6670

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Makefile 
Log Message:
welcome to the future already.  default to apache 2

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.145.2.14
retrieving revision 1.145.2.15
diff -u -d -r1.145.2.14 -r1.145.2.15
--- Makefile	13 May 2008 19:13:36 -0000	1.145.2.14
+++ Makefile	20 Jun 2008 03:00:18 -0000	1.145.2.15
@@ -22,11 +22,11 @@
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
 #mod_perl v1
-APACHE_VERSION = 1
+#APACHE_VERSION = 1
 #mod_perl v2 prereleases up to and including 1.999_21
 #APACHE_VERSON = 1.99
 #mod_perl v2 proper and prereleases 1.999_22 and after
-#APACHE_VERSION = 2
+APACHE_VERSION = 2
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -54,9 +54,9 @@
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
 #deb w/apache2
-#HTTPD_RESTART = /etc/init.d/apache2 restart
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd