freeside Makefile,1.123,1.124

[ivan]

Update of /home/cvs/cvsroot/freeside
In directory pouncequick:/tmp/cvs-serv6423

Modified Files:
	Makefile 
Log Message:
fix install-apache for bsd make and reverse accidentally-checked-in (again!) RT_ENABLED = 1

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- Makefile	7 Apr 2005 10:35:26 -0000	1.123
+++ Makefile	10 Apr 2005 01:13:06 -0000	1.124
@@ -82,8 +82,8 @@
 SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
 #SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd"
 
-#RT_ENABLED = 0
-RT_ENABLED = 1
+RT_ENABLED = 0
+#RT_ENABLED = 1
 RT_DOMAIN = example.com
 RT_TIMEZONE = US/Pacific;
 #RT_TIMEZONE = US/Eastern;
@@ -191,11 +191,12 @@
 
 install-apache:
 	[ -d ${APACHE_CONF} ] && \
-	  install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
-	  ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
-	  perl -p -i -e "\
-	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-	  " ${APACHE_CONF}/freeside-*.conf
+	  ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+	    perl -p -i -e "\
+	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	    " ${APACHE_CONF}/freeside-*.conf \
+	  ) || true
 
 install-selfservice:
 	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'