From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 9D1376DE0F8A for ; Mon, 10 Jun 2019 12:03:23 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.421 X-Spam-Level: X-Spam-Status: No, score=0.421 tagged_above=-999 required=5 tests=[AWL=-0.231, SPF_NEUTRAL=0.652] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aSTQz14il2oj for ; Mon, 10 Jun 2019 12:03:23 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by arlo.cworth.org (Postfix) with ESMTP id E32A86DE0F80 for ; Mon, 10 Jun 2019 12:03:22 -0700 (PDT) Received: from guru.guru-group.fi (localhost [IPv6:::1]) by guru.guru-group.fi (Postfix) with ESMTP id E1417100084; Mon, 10 Jun 2019 22:03:20 +0300 (EEST) From: Tomi Ollila To: David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH] doc: Don't install emacs docs when they are not built In-Reply-To: <20190610104540.12472-1-david@tethera.net> References: <20190610104540.12472-1-david@tethera.net> User-Agent: Notmuch/0.28.3+84~g41389bb (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2019 19:03:23 -0000 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. > > We use '$(if )' instead of 'ifeq' here (and change ':=' to '=') to > make sure that WITH_EMACS and HAVE_EMACS are defined before we expand > INFO_TEXI_FILES. > > Thanks to Ralph Seichter for reporting the problem, and testing > previous versions of this fix. > --- > doc/Makefile.local | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/doc/Makefile.local b/doc/Makefile.local > index 719172fe..92c41b57 100644 > --- a/doc/Makefile.local > +++ b/doc/Makefile.local > @@ -28,7 +28,9 @@ 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) \ > + $(if $(filter 11,$(HAVE_EMACS)$(WITH_EMACS)), $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi,) > + > INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) Interestingly, in your commit message you mention that changing := to = makes a difference. I would have thought that assigning INFO_INFO_FILES with := would have expanded INFO_TEXI_FILES just 2 lines below after its introduction. Anyway, it if helps, good (and change LGTM). I'm just a bit curious... Tomi > > .PHONY: sphinx-html sphinx-texinfo sphinx-info > -- > 2.20.1 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > https://notmuchmail.org/mailman/listinfo/notmuch