diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2019-02-19 20:20:43 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2019-02-19 20:24:17 -0500 |
| commit | f48a1666f8b7b967e202c6e36480209a9656710e (patch) | |
| tree | 2d68a6450531c409f6d84c71124216a81e47f014 | |
| parent | 48e65eb4bd1773dfb7076047df4f366538b81459 (diff) | |
RT# 81961 Pod2Html make docs during build, instead of install
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/freeside-lib.postinst | 15 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 6 insertions, 16 deletions
@@ -333,7 +333,7 @@ install-chown: install-pod2html: echo "${POD2HTML_DIR}" mkdir -p "${POD2HTML_DIR}" - perl -MFS::Misc::Pod2Html -e "FS::Misc::Pod2Html::fs_pod2html('${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 diff --git a/debian/freeside-lib.postinst b/debian/freeside-lib.postinst index 0692f8910..dbc3a7590 100644 --- a/debian/freeside-lib.postinst +++ b/debian/freeside-lib.postinst @@ -3,19 +3,4 @@ # Rebuild ls-R filename databases used by TeX texhash /usr/local/share/texmf -# Generate HTML documentation from perl POD -if [ -z "$APACHE_VERSION" ]; then - export APACHE_VERSION=`/usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2'` -fi - -if [ -z "$APACHE_DOCUMENT_ROOT" ]; then - export APACHE_DOCUMENT_ROOT=`[ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www'` -fi - -export POD2HTML_DOCUMENT_ROOT="${APACHE_DOCUMENT_ROOT}/freeside/docs/library" - -mkdir -p "$POD2HTML_DOCUMENT_ROOT" -perl -MFS::Misc::Pod2Html -e "FS::Misc::Pod2Html::fs_pod2html('$POD2HTML_DOCUMENT_ROOT');" -chown -R freeside "$POD2HTML_DOCUMENT_ROOT" - exit 0 diff --git a/debian/rules b/debian/rules index 041c895a4..153f17751 100755 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,7 @@ export MASON_HANDLER=$(TMP)-webui/usr/local/etc/freeside/handler.pl export APACHE_VERSION := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2') export APACHE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www') export FREESIDE_DOCUMENT_ROOT = $(TMP)-webui$(APACHE_DOCUMENT_ROOT)/freeside +export POD2HTML_DOCUMENT_ROOT = $(FREESIDE_DOCUMENT_ROOT)/docs/library export INIT_FILE = $(TMP).init export INIT_INSTALL = /bin/true export HTTPD_RESTART = /bin/true @@ -287,6 +288,10 @@ install-stamp: build-stamp s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ " ${RT_PATH}/etc/RT_SiteConfig.pm + # Build pod2html documentation + install -d ${POD2HTML_DOCUMENT_ROOT} + perl -IFS -MFS::Misc::Pod2Html -e "FS::Misc::Pod2Html::fs_pod2html_from_src('${POD2HTML_DOCUMENT_ROOT}');" + dh_install #touch $@ |