<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0"> </HEAD> <BODY> On Wed, 2011-01-05 at 11:04 -0500, Gaetan Nadon wrote: <BLOCKQUOTE TYPE=CITE> <BLOCKQUOTE TYPE=CITE> <PRE> Previously, distcheck failed if documentation generation was disabled, and was also not safe for srcdir != builddir. This patch makes sure that documents are always generated during distcheck, and that the rules to generate them can be found. It also fixes srcdir != builddir for doxygen, following the lead of Telepathy and pretty much everyone else in generating doxygen.conf. The following, which previously failed, now passes for me: cd xserver mkdir build cd build ../configure </PRE> </BLOCKQUOTE> </BLOCKQUOTE> Changing makefile.am sometimes require autoreconf. I am not sure and I don't know why. <BLOCKQUOTE TYPE=CITE> <BLOCKQUOTE TYPE=CITE> <PRE> make distcheck </PRE> </BLOCKQUOTE> This is fairly complex, it would be nice to identify which code fixes which problem: 1- you want to build devel docs at dist time when --disable-devel-docs is specified. Whatever code makes it work that way should be commented as such as it maybe upset by future changes. It will remind others to test for it. 2- fix doxygen when running make distcheck from a VPATH build. </BLOCKQUOTE> Some test results. I used my regular plain xserver build and applied the patch. I cleaned up the doc directory. Ran autogen,.sh --disable-devel-docs git status: <BLOCKQUOTE> <PRE> # Untracked files: #   (use "git add <file>..." to include in what will be committed) # # hw/dmx/doc/doxygen.conf </PRE> </BLOCKQUOTE> make: The DocBook/XML dmx and scaled docs html/pdf/txt are generated while they should not. I cleaned the doc dir again to pretend they had not built. make dist: (which is always ran before distcheck) The DocBook/XML dmx.txt and scaled.txt docs are generated, but then: <BLOCKQUOTE> <PRE> cp: cannot stat `./html': No such file or directory </PRE> </BLOCKQUOTE> I created the directory and ran make dist again. The tarball is created but the html generated files are missing. </BODY> </HTML>