From: Peter Eisentraut Date: Thu, 14 Dec 2017 18:54:58 +0000 (-0500) Subject: Fix handling of absent rst2man X-Git-Tag: pgbouncer_1_8~6^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daf73978450dcb3a05b2805d7a14c819896f8f3a;p=pgbouncer Fix handling of absent rst2man The makefile line RST2MAN ?= rst2man didn't have the desired effect, because config.mak sets RST2MAN, and ?= doesn't do anything if the variable is set to empty. So instead let configure put in a default value if the program cannot be found. --- diff --git a/configure.ac b/configure.ac index b9df3c8..c085469 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ AC_USUAL_PROGRAM_CHECK PKG_PROG_PKG_CONFIG dnl check for rst2man -AC_CHECK_PROGS(RST2MAN, rst2man) +AC_CHECK_PROGS(RST2MAN, rst2man, rst2man) dnl check for windows tools if test "$PORTNAME" = "win32"; then diff --git a/doc/Makefile b/doc/Makefile index 9f80dda..010c220 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,7 +1,5 @@ -include ../config.mak -RST2MAN ?= rst2man - manpages = pgbouncer.1 pgbouncer.5 dist_man_MANS = $(manpages)