bah! THIS should fix munging of non-internal links, i hope

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index ed77ff8..781467f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,13 @@ FREESIDE_EXPORT = /usr/local/etc/freeside
 MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
+#mod_perl v1
+APACHE_VERSION = 1
+#mod_perl v2 prereleases up to and including 1.999_21
+#APACHE_VERSON = 1.99
+#mod_perl v2 proper and prereleases 1.999_22 and after
+#APACHE_VERSION = 2
+
 # only mason now
 TEMPLATE = mason
 
@@ -105,8 +112,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.1
-TAG=freeside_1_7_1
+VERSION=1.9.0cvs
+TAG=freeside_1_9_0
 
 help:
        @echo "supported targets:"
@@ -123,14 +130,13 @@ help:
        @echo "                   dev dev-docs dev-perl-modules"
        @echo
        @echo "                   masondocs alldocs docs"
-       @echo "                   htmlman forcehtmlman"
+       @echo "                   wikiman"
        @echo "                   perl-modules"
        #@echo
        #@echo "                   upload-docs release update-webdemo"
 
 
-#masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
-masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
+masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
        rm -rf masondocs
        cp -pr httemplate masondocs
        touch masondocs
@@ -140,22 +146,9 @@ alldocs: masondocs
 docs:
        make ${TEMPLATE}docs
 
-htmlman:
-       [ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-       [ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-       [ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
-       [ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-       [ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
-       chmod a+rx bin/pod2x
-       [ -e DONT_REBUILD_DOCS ] || bin/pod2x
-
-forcehtmlman:
-       [ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
-       [ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
-       [ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
-       [ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
-       [ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
-       bin/pod2x
+wikiman:
+       chmod a+rx ./bin/pod2x
+       ./bin/pod2x
 
 install-docs: docs
        [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -177,6 +170,7 @@ dev-docs:
        perl -p -i -e "\
          s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
          s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+         s'%%%MASONDATA%%%'${MASONDATA}'g;\
          s'###use Module::Refresh;###'use Module::Refresh;'; \
          s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
        " ${MASON_HANDLER} || true
@@ -230,11 +224,13 @@ install-init:
        ${INIT_INSTALL}
 
 install-apache:
+       [ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true
        [ -d ${APACHE_CONF} ] && \
-         ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+         ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
            ( [ ${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'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
            " ${APACHE_CONF}/freeside-*.conf \
          ) || true
 
@@ -245,8 +241,7 @@ install-selfservice:
          ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
          ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
          scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
-         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/" ;\
-         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
           ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
        done
 
@@ -327,13 +322,13 @@ create-rt: configure-rt
        rt/sbin/rt-setup-database --action insert_initial \
        && rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
        || true
+
+install-rt:
        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
-
-install-rt:
        [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
@@ -348,10 +343,6 @@ clean:
 
 #these are probably only useful if you're me...
 
-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:
        cd /home/ivan/freeside