improve mandatory fields, #9260

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index bece052..6c7aac4 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.1/
 
-VERSION=2.1.1
-TAG=freeside_2_1_1
+VERSION=2.1.3cvs
+TAG=freeside_2_1_3
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -196,6 +196,7 @@ perl-modules:
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
          s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
          s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+         s'%%%RT_PATH%%%'${RT_PATH}'g; \
          s'%%%MASONDATA%%%'${MASONDATA}'g;\
        " blib/lib/FS/*.pm;\
        perl -p -i -e "\
@@ -220,7 +221,7 @@ perl-modules:
          s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
        " blib/script/*
 
-install-perl-modules: perl-modules
+install-perl-modules: perl-modules install-rt-initialdata
        [ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
          && rm ${PERL_INC_DEV_KLUDGE}/FS \
          && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \
@@ -374,6 +375,11 @@ install-rt:
          s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
        " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
+install-rt-initialdata:
+       if [ ${RT_ENABLED} -eq 1 ]; then \
+         install -D -o freeside -g freeside -m 0440 rt/etc/initialdata \
+         ${RT_PATH}/etc/initialdata; fi
+
 clean:
        rm -rf masondocs
        rm -rf httemplate/docs/man