From abeeb31b2b49921b01d4ce7cfbac82dfa6c292bb Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 8 Nov 2021 14:20:07 +0100 Subject: [PATCH] docs: skip building texinfo and PDF files The MSYS2 packages lack the infrastructure to build those. Signed-off-by: Johannes Schindelin --- winsup/configure.ac | 7 +++---- winsup/doc/Makefile.am | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/winsup/configure.ac b/winsup/configure.ac index b9e3977fcf..b88f3ade29 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -84,11 +84,10 @@ AM_CONDITIONAL(BUILD_DOC, [test $enable_doc != "no"]) AC_CHECK_PROGS([DOCBOOK2XTEXI], [docbook2x-texi db2x_docbook2texi]) if test -z "$DOCBOOK2XTEXI" ; then if test "x$enable_doc" != "xno"; then - AC_MSG_ERROR([docbook2texi is required to build documentation]) - else - unset DOCBOOK2XTEXI - AM_MISSING_PROG([DOCBOOK2XTEXI], [docbook2texi]) + AC_MSG_WARN([docbook2texi is required to build documentation]) fi + unset DOCBOOK2XTEXI + AM_MISSING_PROG([DOCBOOK2XTEXI], [docbook2texi]) fi AC_CHECK_PROGS([XMLTO], [xmlto]) diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am index 650e0c9247..55e9b95e78 100644 --- a/winsup/doc/Makefile.am +++ b/winsup/doc/Makefile.am @@ -10,9 +10,7 @@ man1_MANS = man3_MANS = man5_MANS = -doc_DATA = \ - cygwin-ug-net/cygwin-ug-net.pdf \ - cygwin-api/cygwin-api.pdf +doc_DATA = htmldir = $(datarootdir)/doc @@ -35,8 +33,7 @@ all-local: Makefile.dep \ cygwin-ug-net/cygwin-ug-net.html \ faq/faq.html faq/faq.body \ cygwin-ug-net/cygwin-ug-net-nochunks.html.gz \ - api2man.stamp intro2man.stamp utils2man.stamp \ - cygwin-api.info cygwin-ug-net.info + api2man.stamp intro2man.stamp utils2man.stamp clean-local: rm -f Makefile.dep @@ -76,7 +73,7 @@ install-etc: @$(MKDIR_P) $(DESTDIR)$(sysconfdir)/preremove $(INSTALL_SCRIPT) $(srcdir)/etc.preremove.cygwin-doc.sh $(DESTDIR)$(sysconfdir)/preremove/cygwin-doc.sh -install-data-hook: install-extra-man install-html-local install-info-local install-etc +install-data-hook: install-extra-man install-html-local install-etc uninstall-extra-man: for i in *.1 ; do \