Skip to content

Commit 5ff494b

Browse files
sshambarsshambar
authored
Merge 12734a1 into ed967d6 
2 parents ed967d6 + 12734a1 commit 5ff494b

File tree

7 files changed

+324
-117
lines changed

7 files changed

+324
-117
lines changed

‎clients/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ endif HAVE_WINDOWS
133133
# libdir='//lib'
134134
CLEANFILES += libupsclient-version.h
135135
libupsclient-version.h: libupsclient.la
136-
@dlname_filter() { sed -e 's/^[^=]*=//' -e 's/^"\(.*\)"$$/\1/' -e 's/^'"'"'\(.*\)'"'"'$$/\1/' ; }; \
136+
@echo " GENERATE-HEADER $@" ; \
137+
dlname_filter() { sed -e 's/^[^=]*=//' -e 's/^"\(.*\)"$$/\1/' -e 's/^'"'"'\(.*\)'"'"'$$/\1/' ; }; \
137138
SOFILE_LIBUPSCLIENT="`grep -E '^dlname' '$?' | dlname_filter`" \
138139
|| SOFILE_LIBUPSCLIENT="" ; \
139140
if [ x"$${SOFILE_LIBUPSCLIENT-}" = x ] ; then \

‎docs/Makefile.am‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ all:
3737
#EGREP = egrep
3838
EGREP = grep -E
3939

40+
# Possible man page section remapping in some distros:
41+
MAN_SECTION_API_BASE=@MAN_SECTION_API_BASE@
42+
MAN_SECTION_CFG_BASE=@MAN_SECTION_CFG_BASE@
43+
MAN_SECTION_CMD_SYS_BASE=@MAN_SECTION_CMD_SYS_BASE@
44+
MAN_SECTION_CMD_USR_BASE=@MAN_SECTION_CMD_USR_BASE@
45+
# Other rewritable properties:
46+
NUT_WEBSITE_BASE=@NUT_WEBSITE_BASE@
47+
PACKAGE_VERSION=@PACKAGE_VERSION@
48+
TREE_VERSION=@TREE_VERSION@
49+
4050
IMAGE_FILES = \
4151
images/asciidoc.png \
4252
images/hostedby.png \
@@ -537,21 +547,21 @@ A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) \
537547
--xsltproc-opts="--nonet" \
538548
--xsltproc-opts="--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
539549
--xsltproc-opts="--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
540-
--xsltproc-opts="--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
550+
--xsltproc-opts="--stringparam nut.nutversion \"$(PACKAGE_VERSION)\"" \
541551
--attribute=docinfodir="$(builddir)" \
542552
--attribute=iconsdir="$(srcdir)/images" \
543553
--attribute=badges \
544554
--attribute=external_title \
545-
--attribute=tree_version="@TREE_VERSION@" \
555+
--attribute=tree_version="$(TREE_VERSION)" \
546556
--attribute=srcdir="$(abs_srcdir)/" \
547557
--attribute=builddir="$(abs_builddir)/" \
548558
--attribute=top_srcdir="$(abs_top_srcdir)/" \
549559
--attribute=top_builddir="$(abs_top_builddir)/" \
550-
--attribute=MAN_SECTION_API_BASE='@MAN_SECTION_API_BASE@' \
551-
--attribute=MAN_SECTION_CFG_BASE='@MAN_SECTION_CFG_BASE@' \
552-
--attribute=MAN_SECTION_CMD_SYS_BASE='@MAN_SECTION_CMD_SYS_BASE@' \
553-
--attribute=MAN_SECTION_CMD_USR_BASE='@MAN_SECTION_CMD_USR_BASE@' \
554-
--attribute=NUT_WEBSITE_BASE='@NUT_WEBSITE_BASE@' \
560+
--attribute=MAN_SECTION_API_BASE='$(MAN_SECTION_API_BASE)' \
561+
--attribute=MAN_SECTION_CFG_BASE='$(MAN_SECTION_CFG_BASE)' \
562+
--attribute=MAN_SECTION_CMD_SYS_BASE='$(MAN_SECTION_CMD_SYS_BASE)' \
563+
--attribute=MAN_SECTION_CMD_USR_BASE='$(MAN_SECTION_CMD_USR_BASE)' \
564+
--attribute=NUT_WEBSITE_BASE='$(NUT_WEBSITE_BASE)' \
555565
-a toc -a numbered --destination-dir=$${A2X_OUTDIR}
556566
# NOTE: a2x newer than 8.6.8 says "--destination-dir" is only valid for HTML.
557567
# As of version 8.6.9 it lies, and the argument is required for our distcheck
@@ -982,10 +992,10 @@ $(abs_top_builddir)/docs/.prep-src-docs: $(PREP_SRC)
982992
esac ; \
983993
if $$MAN_SECTIONS_DEFAULT ; then \
984994
sed \
985-
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 @NUT_WEBSITE_BASE@/,' ; \
995+
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 $(NUT_WEBSITE_BASE)/,' ; \
986996
else \
987997
sed \
988-
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 @NUT_WEBSITE_BASE@/,' \
998+
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 $(NUT_WEBSITE_BASE)/,' \
989999
-e 's,\(linkman:[^ []*\[\)3\],\1$(MAN_SECTION_API)],g' \
9901000
-e 's,\(linkman:[^ []*\[\)5\],\1$(MAN_SECTION_CFG)],g' \
9911001
-e 's,\(linkman:[^ []*\[\)8\],\1$(MAN_SECTION_CMD_SYS)],g' \
@@ -1038,10 +1048,10 @@ $(abs_top_builddir)/docs/.prep-src-docs: $(PREP_SRC)
10381048
fi ; \
10391049
if $$MAN_SECTIONS_DEFAULT || ! $$IS_TEXT ; then \
10401050
sed \
1041-
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 @NUT_WEBSITE_BASE@/,' ; \
1051+
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 $(NUT_WEBSITE_BASE)/,' ; \
10421052
else \
10431053
sed \
1044-
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 @NUT_WEBSITE_BASE@/,' \
1054+
-e 's,\(home page:\) https://www.networkupstools.org/*$$,\1 $(NUT_WEBSITE_BASE)/,' \
10451055
-e 's,\(linkman:[^ []*\[\)3\],\1$(MAN_SECTION_API)],g' \
10461056
-e 's,\(linkman:[^ []*\[\)5\],\1$(MAN_SECTION_CFG)],g' \
10471057
-e 's,\(linkman:[^ []*\[\)8\],\1$(MAN_SECTION_CMD_SYS)],g' \

0 commit comments

Comments
 (0)