Re: master 9e94509 3/3: Generate info/dir directly from any org sources

[Basil L. Contovounesios]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Mattias Engdegård <mattiase@acm.org>
>> Date: Sat, 6 Mar 2021 15:16:21 +0100
>> Cc: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
>> 
>> 6 mars 2021 kl. 12.51 skrev Basil L. Contovounesios <contovob@tcd.ie>:
>> 
>> > -texi_misc = $(shell ${MAKE} --no-print-directory -s -C doc/misc 
>> > echo-sources)
>> > +texi_misc = $(shell ${MAKE} --no-print-directory -O -s -C doc/misc 
>> > echo-sources)
>> 
>> Maybe configure should check for the required GNU Make version then?
>> (Om macOS, the system standard is 3.81, which worked until this
>> change.)
>
> Indeed, it broke my builds as well.  So I reverted the change for now,
> until we find a gentler one.  I don't want us to depend on a Make
> version that is too recent.

I'm sorry about the breakage.

How's the following (hopefully gentler) workaround instead?

>From 6a9fe04962ee4b092df6b09e99a3aa422e080c0a Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Sat, 6 Mar 2021 15:24:33 +0000
Subject: [PATCH] Try another fix for parallel Make subshell output

For discussion, see the following thread:
https://lists.gnu.org/r/emacs-devel/2021-03/msg00255.html

* Makefile.in (srcdir_doc_info_dir_inputs): Discard interspersed
parallel Make output from texi_misc.
---
 Makefile.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 856c29a453..fc5381bc3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1008,13 +1008,17 @@ misc-dvi misc-html misc-pdf misc-ps:
 
 info-dir: ${srcdir}/info/dir
 
+# FIXME: This subshell output can be interspersed with parallel Make
+# output.  The current workaround is to filter only words that look
+# like the file names we expect.  An alternative workaround is to pass
+# the -O option, but that is not supported by older Make versions.
 texi_misc = $(shell ${MAKE} --no-print-directory -s -C doc/misc echo-sources)
 
 srcdir_doc_info_dir_inputs = \
   ${srcdir}/doc/emacs/emacs.texi \
   ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
   ${srcdir}/doc/lispref/elisp.texi \
-  $(addprefix ${srcdir}/doc/misc/,${texi_misc})
+  $(addprefix ${srcdir}/doc/misc/,$(filter %.texi %.org,${texi_misc}))
 info_dir_inputs = \
   ../build-aux/dir_top \
   $(subst ${srcdir}/doc/,,${srcdir_doc_info_dir_inputs})
-- 
2.30.1

Thanks,

-- 
Basil