fix regex

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 8fa09d6..7f4e02a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,10 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
-#deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#deb
+HTTPD_RESTART = /etc/init.d/apache reload
+#suse
+#HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -82,8 +84,8 @@ SELFSERVICE_INSTALL_USER = ivan
 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;
@@ -99,8 +101,8 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-VERSION=1.5.0pre6
-TAG=freeside_1_5_0pre6
+VERSION=1.5.7
+TAG=freeside_1_5_7
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -191,11 +193,12 @@ install-init:
 
 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'