On Mon, Jun 10 2019, David Bremner wrote: > In 40b025 we stopped building the notmuch-emacs documentation if > HAVE_EMACS=0 (i.e. no emacs was detected by configure). Unfortunately > we continued to try to install the (non-existent) documentation, which > causes build/install failures. > > As a bonus, we also avoid installing the documentation if the user > configures --without-emacs. > > Thanks to Ralph Seichter for reporting the problem, and testing > previous versions of this fix. > --- > doc/Makefile.local | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/doc/Makefile.local b/doc/Makefile.local > index a88beb46..d733b51e 100644 > --- a/doc/Makefile.local > +++ b/doc/Makefile.local > @@ -28,7 +28,11 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) > MAN1_TEXI := $(patsubst $(srcdir)/doc/man1/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN1_RST)) > MAN5_TEXI := $(patsubst $(srcdir)/doc/man5/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN5_RST)) > MAN7_TEXI := $(patsubst $(srcdir)/doc/man7/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN7_RST)) > -INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi > +INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) > +ifeq ($(HAVE_EMACS)$(WITH_EMACS),11) > + INFO_TEXI_FILES := $(INFO_TEXI_FILES) $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi > +endif LGTM. I would have suggested += if this weren't going to be temporary solution :D Tomi > + > INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) > > .PHONY: sphinx-html sphinx-texinfo sphinx-info > -- _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch