Revert commit e7e23e73, work around Automake bug
After commit e7e23e73 the build would fail in distcheck on systems with Automake 1.10. An investigation identified Automake bug #533[1] as the cause. Applying the changes in Automake commit 3a12ed5e[2] to the generated Makefile.in file made distcheck work again. The underlying problem is that in our case both doc/html and doc/html/.dir were included in the distributed files. When distcheck copied the former from the source to the staging directory, it was marked as read-only (distcheck makes the whole source read-only). It then tried to copy doc/html/.dir from the build directory, which failed. Automake 1.11 and newer avoid this problem by adjusting the permissions. Since depending on Automake 1.11 or above is not an option at this time, a work-around was found by not using a “.dir” file in doc/html, but using “index.html” as a flag for creating the directory. [1] http://sourceware.org/cgi-bin/gnatsweb.pl?cmd=view&database=automake&pr=533 [2] http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commit;h=3a12ed5e97dc193a38dd14e031658cbd329b50ca Signed-off-by:Michael Hanselmann <hansmi@google.com> Reviewed-by:
René Nussbaumer <rn@google.com>
Loading
Please register or sign in to comment