add a logout link (RT 1330 & 5518)

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 10b96e2..41b3e8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -171,6 +171,7 @@ install-docs: docs
        cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
        chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
        cp htetc/handler.pl ${MASON_HANDLER}
+       cp htetc/htpasswd.logout ${FREESIDE_CONF}
        [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
        chown -R freeside ${MASONDATA}
 
@@ -345,7 +346,8 @@ configure-rt:
                    --with-db-rt-pass=${DB_PASSWORD} \
                    --with-web-user=freeside \
                    --with-web-group=freeside \
-                   --with-rt-group=freeside
+                   --with-rt-group=freeside \
+                   --with-web-handler=modperl2
 
 create-rt: configure-rt
        [ -d /opt           ] || mkdir /opt           #doh
@@ -361,12 +363,12 @@ create-rt: configure-rt
        || true
 
 install-rt:
-       perl -p -i -e "\
+       [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
+       [ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
          s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
          s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
          s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
        " ${RT_PATH}/etc/RT_SiteConfig.pm
-       [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
        rm -rf masondocs