Skip to content

Commit 63140c6

Browse files
committed
Use pandoc to build pg_arman documentation
1 parent e88cd16 commit 63140c6

File tree

4 files changed

+45
-2
lines changed

4 files changed

+45
-2
lines changed

GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ distdir:
109109
$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
110110
cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
111111
$(MAKE) -C $(distdir) distclean
112-
$(MAKE) -C $(distdir)/contrib/pg_arman/doc pg_arman.1 XMLTO=/usr/bin/xmlto ASCIIDOC=/usr/bin/asciidoc
112+
cd $(distdir)/contrib/pg_arman/doc; $(PANDOC) -o pg_arman.1 -t man -s pg_arman.md
113113
rm -f $(distdir)/README.git
114114

115115
distcheck: dist

configure

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@ PGPRO_VERSION
631631
vpath_build
632632
PG_VERSION_NUM
633633
PROVE
634+
PANDOC
634635
OSX
635636
XSLTPROC
636637
XMLLINT
@@ -17257,6 +17258,47 @@ fi
1725717258
test -n "$OSX" && break
1725817259
done
1725917260

17261+
for ac_prog in pandoc
17262+
do
17263+
# Extract the first word of "$ac_prog", so it can be a program name with args.
17264+
set dummy $ac_prog; ac_word=$2
17265+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17266+
$as_echo_n "checking for $ac_word... " >&6; }
17267+
if ${ac_cv_prog_PANDOC+:} false; then :
17268+
$as_echo_n "(cached) " >&6
17269+
else
17270+
if test -n "$PANDOC"; then
17271+
ac_cv_prog_PANDOC="$PANDOC" # Let the user override the test.
17272+
else
17273+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17274+
for as_dir in $PATH
17275+
do
17276+
IFS=$as_save_IFS
17277+
test -z "$as_dir" && as_dir=.
17278+
for ac_exec_ext in '' $ac_executable_extensions; do
17279+
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17280+
ac_cv_prog_PANDOC="$ac_prog"
17281+
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17282+
break 2
17283+
fi
17284+
done
17285+
done
17286+
IFS=$as_save_IFS
17287+
17288+
fi
17289+
fi
17290+
PANDOC=$ac_cv_prog_PANDOC
17291+
if test -n "$PANDOC"; then
17292+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
17293+
$as_echo "$PANDOC" >&6; }
17294+
else
17295+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17296+
$as_echo "no" >&6; }
17297+
fi
17298+
17299+
17300+
test -n "$PANDOC" && break
17301+
done
1726017302

1726117303
#
1726217304
# Check for test tools

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,7 @@ AC_CHECK_PROGS(DBTOEPUB, dbtoepub)
21342134
AC_CHECK_PROGS(XMLLINT, xmllint)
21352135
AC_CHECK_PROGS(XSLTPROC, xsltproc)
21362136
AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
2137-
2137+
AC_CHECK_PROGS(PANDOC, pandoc)
21382138
#
21392139
# Check for test tools
21402140
#

src/Makefile.global.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ NSGMLS = @NSGMLS@
403403
OSX = @OSX@
404404
XMLLINT = @XMLLINT@
405405
XSLTPROC = @XSLTPROC@
406+
PANDOC = @PANDOC@
406407

407408
# Code coverage
408409

0 commit comments

Comments
 (0)