communigate provisioning phase 2: Domain:Account Defaults:Settings: RulesAllowed...

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 59d2498..ae46074 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.9.0cvs
-TAG=freeside_1_9_0
+VERSION=1.9.3cvs
+TAG=freeside_1_9_3
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -140,7 +140,7 @@ help:
        @echo
        @echo "                   install-docs install-perl-modules"
        @echo "                   install-init install-apache"
-       @echo "                   install-rt"
+       @echo "                   install-rt install-texmf"
        @echo "                   install-selfservice update-selfservice"
        @echo
        @echo "                   dev dev-docs dev-perl-modules"
@@ -198,7 +198,14 @@ perl-modules:
          s'%%%MASONDATA%%%'${MASONDATA}'g;\
        " blib/lib/FS/*.pm;\
        perl -p -i -e "\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+         s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
+         s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+       " blib/lib/FS/Cron/*.pm;\
+       perl -p -i -e "\
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+         s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
@@ -308,12 +315,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}"
 
@@ -327,7 +328,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; \
@@ -360,12 +362,12 @@ create-rt: configure-rt
        || true
 
 install-rt:
-       perl -p -i -e "\
+       if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+       if [ ${RT_ENABLED} -eq 1 ]; then 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
+       " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
        rm -rf masondocs
@@ -383,12 +385,13 @@ clean:
 .PHONY: release
 release:
        # Update the changelog
-       ./CVS2CL
+       ./bin/cvs2cl
        cvs commit -m "Updated for ${VERSION}" ChangeLog
 
        # Update the RPM specfile
        cvs edit ${RPM_SPECFILE}
        perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+       perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
        cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
 
        # Update the Debian changelog