X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=7055c292b1b05a9883fc7957fda0c81d72b8e894;hp=c6eef91b00bce652333fe8d54f117e4d9e415728;hb=fc263806f5e475559a0c4cfdb70a5f1cefe0ffa3;hpb=f77cbf2281ef5ea2e0b81b64fdd1dd78fca3e543 diff --git a/Makefile b/Makefile index c6eef91b0..7055c292b 100644 --- a/Makefile +++ b/Makefile @@ -26,17 +26,8 @@ MASONDATA = ${FREESIDE_CACHE}/masondata #package maintainers DIST_CONF = ${FREESIDE_CONF}/default_conf -#mod_perl v2 1.999_22 on Apache 2.0 through 2.3 (Debian ancient through 7.x) -#APACHE_VERSION=2 -#Apache 2.4 (Debian 8.x) -#APACHE_VERSION=2.4 -APACHE_VERSION := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2') - -#deb (-7 and upgrades) -#FREESIDE_DOCUMENT_ROOT = /var/www/freeside -#deb (new installs of 8+) (plus needs more work w/new auth) -#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside -FREESIDE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html/freeside' || echo '/var/www/freeside') +#deb +FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside #redhat, fedora, mandrake #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside @@ -49,6 +40,8 @@ FREESIDE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/ww #apache #FREESIDE_DOCUMENT_ROOT = /usr/local/apache/htdocs/freeside +POD2HTML_DIR = ${FREESIDE_DOCUMENT_ROOT}/docs/library + #deb, redhat, fedora, mandrake, suse, others? INIT_FILE = /etc/init.d/freeside #freebsd @@ -75,12 +68,8 @@ HTTPD_RESTART = /etc/init.d/apache2 restart #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf) -#deb (3.1+), apache2 -#APACHE_CONF = /etc/apache2/conf.d #debian unstable/8.0+, apache2.4 -#APACHE_CONF = /etc/apache2/conf-available -APACHE_CONF := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/etc/apache2/conf-available' || echo '/etc/apache2/conf.d') - +APACHE_CONF = /etc/apache2/conf-available INSSERV_OVERRIDE = /etc/insserv/overrides FREESIDE_RESTART = ${INIT_FILE} restart @@ -117,7 +106,7 @@ FREESIDE_URL = "http://localhost/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside -TORRUS_ENABLED = 1 +#TORRUS_ENABLED = 1 # for auto-version updates, so we can "make release" more things automatically RPM_SPECFILE = rpm/freeside.spec @@ -129,7 +118,7 @@ RT_PATH = /opt/rt3 #only used for dev kludge now, not a big deal FREESIDE_PATH = `pwd` -PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.22.1/ +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.28.1/ VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2` TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'` @@ -236,7 +225,7 @@ perl-modules: " blib/lib/FS/part_export/*.pm;\ perl -p -i -e "\ s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ - " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\ + " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm blib/lib/FS/contact/*.pm;\ perl -p -i -e "\ s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ " blib/lib/FS/Daemon/*.pm;\ @@ -271,9 +260,11 @@ dev-perl-modules: perl-modules ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS install-texmf: + mkdir -p /usr/local/share/texmf/tex/latex install -D -o freeside -m 444 etc/*.sty \ /usr/local/share/texmf/tex/latex/ texhash /usr/local/share/texmf + install -D -o root -m 444 etc/GnuMICR.otf /usr/local/etc/freeside install-init: #[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE} @@ -289,7 +280,7 @@ install-init: 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${APACHE_VERSION}.conf ${APACHE_CONF} && \ + ( install -o root -m 755 htetc/freeside-base2.4.conf ${APACHE_CONF} && \ ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \ ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \ perl -p -i -e "\ @@ -298,8 +289,8 @@ install-apache: s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \ " ${APACHE_CONF}/freeside-*.conf \ ) || true - [ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && ( /usr/sbin/a2enconf freeside-base${APACHE_VERSION} ) || true - [ -d ${APACHE_CONF} ] && [ ${APACHE_VERSION} = '2.4' ] && [ -x /usr/sbin/a2disconf ] && ( /usr/sbin/a2disconf freeside-base2 ) || true + [ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && ( /usr/sbin/a2enconf freeside-base2.4 ) || true + [ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2disconf ] && ( /usr/sbin/a2disconf freeside-base2 ) || true [ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && [ ${RT_ENABLED} -eq 1 ] && ( /usr/sbin/a2enconf freeside-rt ) || true [ -d ${INSSERV_OVERRIDE} ] && [ -x /sbin/insserv ] && ( install -o root -m 755 init.d/insserv-override-apache2 ${INSSERV_OVERRIDE}/apache2 && insserv -d ) || true @@ -327,7 +318,13 @@ install-chown: chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}" chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}" -install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown +install-pod2html: + echo "${POD2HTML_DIR}" + mkdir -p "${POD2HTML_DIR}" + perl -IFS -MFS::Misc::Pod2Html -e "FS::Misc::Pod2Html::fs_pod2html_from_src('${POD2HTML_DIR}');" + chown freeside:freeside -R "${POD2HTML_DIR}" + +install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown install-pod2html deploy: install ${HTTPD_RESTART}