make the config directory configurable

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 233b576..c9a3e67 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,13 @@ DATASOURCE = DBI:Pg:dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
+#changable now
+FREESIDE_CONF = /usr/local/etc/freeside
+
 TEMPLATE = mason
 
-ASP_GLOBAL = /usr/local/etc/freeside/asp-global
-MASON_HANDLER = /usr/local/etc/freeside/handler.pl
-MASONDATA = /usr/local/etc/freeside/masondata
+MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
+MASONDATA = ${FREESIDE_CONF}/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -91,8 +92,7 @@ RT_DB_DATABASE = freeside
 
 #---
 
-#not changable yet
-FREESIDE_CONF = /usr/local/etc/freeside
+
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
@@ -100,8 +100,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.0
-TAG=freeside_1_7_0
+VERSION=1.7.1
+TAG=freeside_1_7_1
 
 help:
        @echo "supported targets:"
@@ -117,27 +117,20 @@ help:
        @echo
        @echo "                   dev dev-docs dev-perl-modules"
        @echo
-       @echo "                   aspdocs masondocs alldocs docs"
+       @echo "                   masondocs alldocs docs"
        @echo "                   htmlman forcehtmlman"
        @echo "                   perl-modules"
        #@echo
        #@echo "                   upload-docs release update-webdemo"
 
-aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
-       rm -rf aspdocs
-       cp -pr httemplate aspdocs
-       touch aspdocs
 
-
-masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
+masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
        rm -rf masondocs
        cp -pr httemplate masondocs
-       ( cd masondocs; \
-         ../bin/masonize; \
-       )
        touch masondocs
 
-alldocs: aspdocs masondocs
+alldocs: masondocs
 
 docs:
        make ${TEMPLATE}docs
@@ -162,25 +155,19 @@ forcehtmlman:
 install-docs: docs
        [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
        cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
-       [ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
-       [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
-       [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
-       [ "${TEMPLATE}" = "asp" ] && \
-         perl -p -i -e "\
-           s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-         " ${ASP_GLOBAL}/global.asa || true
-       [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
-       [ "${TEMPLATE}" = "mason" ] && \
+       chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
+       cp htetc/handler.pl ${MASON_HANDLER}
          perl -p -i -e "\
            s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
            s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
-         " ${MASON_HANDLER} || true
-       [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
-       [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
+           s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g;\
+         " ${MASON_HANDLER}
+       [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+       chown -R freeside ${MASONDATA}
 
-dev-docs: docs
+dev-docs:
        [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-       ln -s ${FREESIDE_PATH}/masondocs ${FREESIDE_DOCUMENT_ROOT}
+       ln -s ${FREESIDE_PATH}/httemplate ${FREESIDE_DOCUMENT_ROOT}
        cp htetc/handler.pl ${MASON_HANDLER}
        perl -p -i -e "\
          s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
@@ -196,10 +183,17 @@ perl-modules:
        make; \
        perl -p -i -e "\
          s/%%%VERSION%%%/${VERSION}/g;\
-       " blib/lib/FS.pm; \
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+       " blib/lib/FS.pm;\
        perl -p -i -e "\
-         s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-       " blib/lib/FS/CGI.pm
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+       " blib/lib/FS/*.pm;\
+       perl -p -i -e "\
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+       " blib/lib/FS/part_export/*.pm;\
+       perl -p -i -e "\
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+       " blib/script/*
 
 install-perl-modules: perl-modules
        [ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
@@ -233,6 +227,7 @@ install-apache:
            ( [ ${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; \
+             s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
            " ${APACHE_CONF}/freeside-*.conf \
          ) || true
 
@@ -335,8 +330,13 @@ install-rt:
        [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
-       rm -rf aspdocs masondocs
-       cd FS; \
+       rm -rf masondocs
+       rm -rf httemplate/docs/man
+       rm -rf pod2htmi.tmp
+       rm -rf pod2htmd.tmp
+       -cd FS; \
+       make clean
+       -cd fs_selfservice/FS-SelfService; \
        make clean
 
 #these are probably only useful if you're me...
@@ -345,7 +345,8 @@ upload-docs: forcehtmlman
        ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs
        scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs
 
-release: upload-docs
+#release: upload-docs
+release:
        cd /home/ivan/freeside
        #cvs tag ${TAG}
        cvs tag -F ${TAG}