remove old no-longer-relevant attempts to rotate out HTML files and check the tree...

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 903c0eb..dd7adb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ HTTPD_RESTART = /etc/init.d/apache2 restart
 #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
 #deb (3.1+), apache2
 APACHE_CONF = /etc/apache2/conf.d
+INSSERV_OVERRIDE = /etc/insserv/overrides
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -163,11 +164,15 @@ wikiman:
        chmod a+rx ./bin/pod2x
        ./bin/pod2x
 
-install-docs: check-conflicts docs
-       [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-       cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+install-docs: docs
+       #ancient attempt to avoid overwriting customer modifications directly to production web files that's overlived its usefulness
+       #[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
+       #cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+       [ -h ${FREESIDE_DOCUMENT_ROOT} ] && rm ${FREESIDE_DOCUMENT_ROOT} || true
+       mkdir -p ${FREESIDE_DOCUMENT_ROOT}
+       cp -r masondocs/* masondocs/.htaccess ${FREESIDE_DOCUMENT_ROOT}
        chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
-       cp htetc/handler.pl ${MASON_HANDLER}
+       install -D htetc/handler.pl ${MASON_HANDLER}
        perl -p -i -e "\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
          s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
@@ -185,6 +190,8 @@ dev-docs:
        perl -p -i -e "\
          s'###use Module::Refresh;###'use Module::Refresh;'; \
          s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
+         s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+         s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
        " ${MASON_HANDLER} || true
 
 perl-modules:
@@ -222,7 +229,7 @@ perl-modules:
          s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
        " blib/script/*
 
-install-perl-modules: check-conflicts perl-modules install-rt-initialdata
+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 \
@@ -244,9 +251,9 @@ dev-perl-modules: perl-modules
        ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf: 
-       install -D -o freeside -m 444 etc/fslongtable.sty \
-          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
-       texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
+       install -D -o freeside -m 444 etc/longtable.sty \
+         /usr/local/share/texmf/tex/latex/longtable.sty
+       texhash /usr/local/share/texmf
 
 install-init:
        #[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
@@ -270,6 +277,7 @@ install-apache:
              s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
            " ${APACHE_CONF}/freeside-*.conf \
          ) || true
+       [ -d ${INSSERV_OVERRIDE} ] && [ -x /sbin/insserv ] && ( install -o root -m 755 init.d/insserv-override-apache2 ${INSSERV_OVERRIDE}/apache2 && insserv -d ) || true
 
 install-selfservice:
        [ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
@@ -368,7 +376,7 @@ create-rt: configure-rt
                                     --datafile ${RT_PATH}/etc/initialdata \
        || true
 
-install-rt: check-conflicts
+install-rt: 
        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;\
@@ -408,9 +416,6 @@ clean:
        -cd fs_selfservice/FS-SelfService; \
        make clean
 
-check-conflicts:
-       ! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' .
-
 #these are probably only useful if you're me...
 
 #release: upload-docs