On Mon, Aug 05, 2024 at 07:03:08PM +0200, Bruno Haible wrote: > Patrice Dumas wrote: > > This is not complete. > > 1) With this patch, the main texi2any_internals.texi still is generated in the > build dir — which it shouldn't, since it is distributed. > > Here is my procedure: > $ ./configure > $ make maintainer-clean > $ git diff -- doc/html_default_commands_args.texi doc/pod2texi.texi > man/pod2texi.1 po_document/texinfo_document.pot > tp/Texinfo/XS/gnulib/lib/unicase/special-casing-table.h > tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.h > tp/Texinfo/XS/main/command_ids.h tp/Texinfo/XS/main/element_types.c > tp/Texinfo/XS/main/element_types.h | patch -p1 -R > $ mkdir bb > $ cd bb > $ ../configure > $ make > $ make distclean > $ find . -type f > ./doc/tp_api/texi2any_internals.texi
I attach a patch that fixes this issue by putting all the generated Texinfo files in srcdir. > 2) Texinfo/ModulePath.pm is no longer found in a particular situation > (not sure whether this situation is supported). > > How to reproduce: > > $ ./configure > $ make maintainer-clean > $ ./configure > $ make distcheck This passes too. I think that it should pass -- if all the maintainer tools are present, possibly with a manual reset of texi2any_internals.texi. -- Pat
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am index a2d3a888be..3dc8e521c3 100644 --- a/doc/tp_api/Makefile.am +++ b/doc/tp_api/Makefile.am @@ -78,8 +78,8 @@ texi2any_internals_dependencies = \ $(top_srcdir)/tp/Texinfo/Convert/TexinfoXML.pm \ $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm -texi2any_internals.texi: $(texi2any_internals_dependencies) texi2any_internals_indices.texi texi2any_internals_preamble.texi - if $(MAKEINFO_ENVIRONMENT) $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - --subdir=api_includes $(texi2any_internals_dependencies) < $(srcdir)/texi2any_internals_preamble.texi >$@.tmp ; then \ +$(srcdir)/texi2any_internals.texi: $(texi2any_internals_dependencies) $(srcdir)/texi2any_internals_indices.texi $(srcdir)/texi2any_internals_preamble.texi + if $(MAKEINFO_ENVIRONMENT) $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - --subdir=$(srcdir)/api_includes $(texi2any_internals_dependencies) < $(srcdir)/texi2any_internals_preamble.texi >$@.tmp ; then \ cat $@.tmp | sed -e 's/^@bye/@__bye/' | sed -e '/^@__bye/r $(srcdir)/texi2any_internals_indices.texi' | sed -e 's/^@__bye//' > $@ ; \ fi ; rm -f $@.tmp
