can't we all just get along (with RT 3.8.7)?

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index df85a06..6d0b2c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -314,12 +314,6 @@ create-config: install-perl-modules
        chmod 600 ${FREESIDE_CONF}/secrets
        chown freeside ${FREESIDE_CONF}/secrets
 
-       mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       rm -rf conf/registries #old dirs just won't go away
-       #cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
-       chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
        mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
        chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
@@ -333,7 +327,8 @@ create-config: install-perl-modules
        install -d $(DIST_CONF)
        #install conf/[a-z]* $(DEFAULT_CONF)
        #CVS is not [a-z]
-       install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF)
+       install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
+
 
 configure-rt:
        cd rt; \
@@ -350,7 +345,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
@@ -366,12 +362,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