Imported Upstream version 2.7.3

This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions

View file

@ -516,6 +516,15 @@ endif
HTML_MACOSX_MANS = macosx-ups.html
SRC_LINUX_I2C_PAGES = asem.txt
MAN_LINUX_I2C_PAGES = asem.8
if WITH_LINUX_I2C
man8_MANS += $(LINUX_I2C_PAGES)
endif
HTML_LINUX_I2C_MANS = asem.html
# SOME_DRIVERS
endif
@ -533,7 +542,8 @@ MAN_MANS = \
$(MAN_NETXML_PAGES) \
$(MAN_POWERMAN_PAGES) \
$(MAN_IPMIPSU_PAGES) \
$(MAN_MACOSX_PAGES)
$(MAN_MACOSX_PAGES) \
$(MAN_LINUX_I2C_PAGES)
# distribute everything, even those not installed by default
# Note that 'dist' target requires AsciiDoc!
@ -550,6 +560,7 @@ EXTRA_DIST = \
$(SRC_POWERMAN_PAGES) \
$(SRC_IPMIPSU_PAGES) \
$(SRC_MACOSX_PAGES) \
$(SRC_LINUX_I2C_PAGES) \
$(MAN_MANS) \
asciidoc.conf
@ -565,7 +576,8 @@ HTML_MANS = \
$(HTML_NETXML_MANS) \
$(HTML_POWERMAN_MANS) \
$(HTML_IPMIPSU_MANS) \
$(HTML_MACOSX_MANS)
$(HTML_MACOSX_MANS) \
$(HTML_LINUX_I2C_MANS)
all:
@ -581,10 +593,12 @@ if HAVE_ASCIIDOC
$(ASCIIDOC) --backend=xhtml11 \
--attribute localdate=`TZ=UTC date +%Y-%m-%d` \
--attribute localtime=`TZ=UTC date +%H:%M:%S` \
--attribute nutversion="@PACKAGE_VERSION@" \
-o $@ $<
### Prior to Asciidoc ~8.6.8, the --destination-dir flag didn't seem to affect the location of the intermediate .xml file.
A2X_MANPAGE_OPTS = --doctype manpage --format manpage \
--xsltproc-opts "--nonet" \
--attribute mansource="Network UPS Tools" \
--attribute manversion="@PACKAGE_VERSION@" \
--attribute manmanual="NUT Manual" \
@ -605,18 +619,48 @@ A2X_MANPAGE_OPTS = --doctype manpage --format manpage \
else !HAVE_ASCIIDOC
.txt.html:
@echo "Not (re)building $@ manual page, since 'asciidoc' was not found."
@if [ -r "$@" ]; then \
echo "Not (re)building $@ manual page, since 'asciidoc', 'xmllint' or 'xsltproc' were not found." ; \
else \
echo "Could not find prebuilt $@ manual page." ; \
echo "If you are building from Git, do you have all of the asciidoc/a2x tools installed?"; \
exit 1; \
fi
.txt.1:
@echo "Using existing $@ manual page, since 'asciidoc' was not found."
@if [ -r "$@" ]; then \
echo "Not (re)building $@ manual page, since 'asciidoc', 'xmllint' or 'xsltproc' were not found." ; \
else \
echo "Could not find prebuilt $@ manual page." ; \
echo "If you are building from Git, do you have all of the asciidoc/a2x tools installed?"; \
exit 1; \
fi
.txt.3:
@echo "Using existing $@ manual page, since 'asciidoc' was not found."
@if [ -r "$@" ]; then \
echo "Not (re)building $@ manual page, since 'asciidoc', 'xmllint' or 'xsltproc' were not found." ; \
else \
echo "Could not find prebuilt $@ manual page." ; \
echo "If you are building from Git, do you have all of the asciidoc/a2x tools installed?"; \
exit 1; \
fi
.txt.5:
@echo "Using existing $@ manual page, since 'asciidoc' was not found."
@if [ -r "$@" ]; then \
echo "Not (re)building $@ manual page, since 'asciidoc', 'xmllint' or 'xsltproc' were not found." ; \
else \
echo "Could not find prebuilt $@ manual page." ; \
echo "If you are building from Git, do you have all of the asciidoc/a2x tools installed?"; \
exit 1; \
fi
.txt.8:
@echo "Using existing $@ manual page, since 'asciidoc' was not found."
@if [ -r "$@" ]; then \
echo "Not (re)building $@ manual page, since 'asciidoc', 'xmllint' or 'xsltproc' were not found." ; \
else \
echo "Could not find prebuilt $@ manual page." ; \
echo "If you are building from Git, do you have all of the asciidoc/a2x tools installed?"; \
exit 1; \
fi
endif !HAVE_ASCIIDOC