]> granicus.if.org Git - pgbouncer/commitdiff
Fix handling of absent rst2man
authorPeter Eisentraut <peter@eisentraut.org>
Thu, 14 Dec 2017 18:54:58 +0000 (13:54 -0500)
committerPeter Eisentraut <peter@eisentraut.org>
Thu, 14 Dec 2017 18:54:58 +0000 (13:54 -0500)
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.

configure.ac
doc/Makefile

index b9df3c826f26dff2a92169d2270f5410f1b0e2c3..c08546925c5cbe788147884b31be55ca88590b8f 100644 (file)
@@ -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
index 9f80dda7df8941eda13b91403e65dc0e864ae6fa..010c220e5b39b00c25c07625f8f1325d7a0df8b7 100644 (file)
@@ -1,7 +1,5 @@
 -include ../config.mak
 
-RST2MAN ?= rst2man
-
 manpages = pgbouncer.1 pgbouncer.5
 
 dist_man_MANS = $(manpages)