From 95455453b11d866027873cb72f276e10680a2cf1 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 26 Jan 2019 20:14:30 +0100 Subject: [PATCH] Fix compilation for lack of docbook2x-man The guard in doc/Makefile.am was supposed to protect against publishing release tarballs lacking a compiled xmlwf.1 man page without noticing. Now it does no more than advertised. --- expat/Changes | 1 + expat/doc/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/expat/Changes b/expat/Changes index e5f47838..49eb7ee2 100644 --- a/expat/Changes +++ b/expat/Changes @@ -12,6 +12,7 @@ Release x.x.x XXX XXXXXX XX XXXX #228 Autotools: Modernize configure.ac #243 Windows: Fix syntax of .def module definition files #245 #246 Autotools: Fix check for -fvisibility=hidden for Clang + #247 #248 Autotools: Fix compilation for lack of docbook2x-man Special thanks to: Benjamin Peterson diff --git a/expat/doc/Makefile.am b/expat/doc/Makefile.am index d8a35c0d..e2f02983 100644 --- a/expat/doc/Makefile.am +++ b/expat/doc/Makefile.am @@ -28,14 +28,17 @@ # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE # USE OR OTHER DEALINGS IN THE SOFTWARE. +.PHONY: dist-hook # not inside conditional to avoid automake warning + +if WITH_DOCBOOK dist_man_MANS = xmlwf.1 xmlwf.1: xmlwf.xml -if WITH_DOCBOOK -rm -f $@ $(DOCBOOK_TO_MAN) $< test -f $@ || mv XMLWF.1 $@ else +dist-hook: @echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2 @false endif