ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix documentation building

Browse Source 
An earlier patch added --disable-docs, but went too far, making it
impossible to build the docs.

It turns out that Automake seemingly has a bug preventing the
conditional build of an info file.  So, this patch works around the
bug by putting the info_TEXINFOS rule into a new doc/Makefile.am.

Tested by building with and without --disable-docs and looking for the
existence of doc/libffi.info.
This commit is contained in:
Tom Tromey
2016-02-22 15:34:39 -07:00
parent f2f234aef2
commit 6dd5fd5a64
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.am
View File

@@ -5,6 +5,14 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = include testsuite man
if BUILD_DOCS
## This hack is needed because it doesn't seem possible to make a
## conditional info_TEXINFOS in Automake. At least Automake 1.14
## either gives errors -- if this attempted in the most
## straightforward way -- or simply unconditionally tries to build the
## info file.
SUBDIRS += doc
endif
EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \
ChangeLog.libffi ChangeLog.libffi-3.1 \
@@ -16,11 +24,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \
libtool-ldflags
info_TEXINFOS =
if BUILD_DOCS
#info_TEXINFOS += doc/libffi.texi
endif
## ################################################################
##