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 B3AD86DE12B0 for ; Sun, 9 Jun 2019 14:47:36 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.046 X-Spam-Level: X-Spam-Status: No, score=-0.046 tagged_above=-999 required=5 tests=[AWL=-0.045, SPF_PASS=-0.001] 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 4I8-45_sF7_z for ; Sun, 9 Jun 2019 14:47:35 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 994E16DE0F4B for ; Sun, 9 Jun 2019 14:47:35 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1ha5f1-0001Qx-Up; Sun, 09 Jun 2019 17:47:31 -0400 Received: (nullmailer pid 30445 invoked by uid 1000); Sun, 09 Jun 2019 21:47:54 -0000 From: David Bremner To: Ralph Seichter , notmuch@notmuchmail.org Subject: Re: Bug: Attempt to install notmuch-emacs.info during --without-emacs build In-Reply-To: <87blz6a6ot.fsf@ra.horus-it.com> References: <87k1duiw05.fsf@ra.horus-it.com> <87d0jmy7l0.fsf@tethera.net> <87blz6a6ot.fsf@ra.horus-it.com> Date: Sun, 09 Jun 2019 18:47:54 -0300 Message-ID: <87a7eqxwfp.fsf@tethera.net> 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: Sun, 09 Jun 2019 21:47:36 -0000 Ralph Seichter writes: > * David Bremner: > >> The following seems to fix the problem, but I haven't tested it >> extensively. > > As shown in https://monksofcool.net/tmp/6bmjUFL.log , your suggestion > results in notmuch-emacs.info being generated but unfortunately not > installed when Notmuch is built --with-emacs. Obviously that's better > than a build failure for --without-emacs, but it is not quite ideal > either. ;-) > Attempt #2; we need to delay expansion of INFO_TEXI_FILES until WITH_EMACS is defined. diff --git a/doc/Makefile.local b/doc/Makefile.local index 719172fe..5b99dd02 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 1,$(WITH_EMACS)), $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi,) + INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) .PHONY: sphinx-html sphinx-texinfo sphinx-info