On Sun, Jun 09, 2024 at 08:06:52PM +0100, Gavin Smith wrote: > However, this is output in the build directory, not the source directory. > (pod2texi.texi is under version control and distributed as part of a > release). > > I want this to be: > > diff --git a/doc/Makefile.am b/doc/Makefile.am > index 511c51490e..0dc4dd11d5 100644 > --- a/doc/Makefile.am > +++ b/doc/Makefile.am > @@ -39,8 +39,8 @@ if BUILD_PERL_API_TEXI > # Texinfo manual. The file name for the included section > # is therefore determined by the information in the Pod file NAME > # section. > -pod2texi.texi: $(pod2texi_pl) > - $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ > $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=subsubsection > --no-section-nodes --headings-as-sections $(pod2texi_pl) > /dev/null > +$(srcdir)/pod2texi.texi: $(pod2texi_pl) > + $(PERL) -I $(top_builddir)/tp -I > $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ > $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=subsubsection > --no-section-nodes --headings-as-sections $(pod2texi_pl) > $@ > endif > > TXI_MODULES_ENV = srcdir="$(srcdir)"; export srcdir; > > but this does not work. This outputs two files called "pod2texi.texi", > one in the build directory (with the correct contents), and one in the > source directory, the contents whereof are: > > Patrice, could you advise? Do we just need to add commands to move > pod2texi.texi to the source directory?
I tried to fix that by using the --subdir option in addition to -I $(top_builddir)/tp, in this commit, based on your proposal: https://git.savannah.gnu.org/cgit/texinfo.git/commit/?id=715ef7924774b919e64dffe5a7f0995ac5e115f7 It works for me. As a side note, there is also html_default_commands_args.texi as a generated file in $(srcdir), there is no $(srcdir) in the rule, but it seems to work fine, as there is an $(srcdir) in the command: html_default_commands_args.texi: $(top_srcdir)/tp/Texinfo/Convert/HTML.pm $(srcdir)/generate_html_doc_texi.pl $(TXI_MODULES_ENV) $(PERL) $(srcdir)/generate_html_doc_texi.pl $(srcdir)/html_default_commands_args.texi Maybe we should be consistent and use for both targets, if possible (maybe it is not possible?) $(srcdir)/pod2texi.texi: $(srcdir)/html_default_commands_args.texi: or never use $(srcdir)/ in targets? -- Pat
