Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 7F006431FCB for ; Thu, 22 Jan 2015 13:55:58 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 2.438 X-Spam-Level: ** X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LRoY0VwewQ8l for ; Thu, 22 Jan 2015 13:55:55 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 2D3DC431FD2 for ; Thu, 22 Jan 2015 13:55:55 -0800 (PST) Received: by guru.guru-group.fi (Postfix, from userid 501) id D61DB1000F3; Thu, 22 Jan 2015 23:55:30 +0200 (EET) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [LATE NIGHT PATCH] build gzipped apidoc in case have doxygen but not sphinx Date: Thu, 22 Jan 2015 23:55:21 +0200 Message-Id: <1421963721-17106-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.0.0 Cc: tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Thu, 22 Jan 2015 21:55:58 -0000 In case we had doxygen but not sphinx notmuch.3 was created but notmuch.3.gz not -- which means install fails! This patch (with late night unpolished commit message will fix that) --- I'll do better one... hmm, next week (unless someone gets there first \o/) doc/Makefile.local | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index 0bdf2e12fc0f..41cba607947d 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -32,7 +32,9 @@ sphinx-info: sphinx-texinfo -include $(dir)/docdeps.mk +ifeq ($(HAVE_SPHINX),1) MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) +endif # Use the man page converter that is available. We should never depend # on MAN_ROFF_FILES if a converter is not available. @@ -74,15 +76,14 @@ apidocs: install-apidocs: endif -# Do not try to build or install man pages if a man page converter is -# not available. +build-man: ${MAN_GZIP_FILES} +install-man: ${MAN_GZIP_FILES} + ifeq ($(HAVE_SPHINX),0) -build-man: install-man: @echo "No sphinx, will not install man pages." else -build-man: ${MAN_GZIP_FILES} -install-man: ${MAN_GZIP_FILES} +install-man: mkdir -p "$(DESTDIR)$(mandir)/man1" mkdir -p "$(DESTDIR)$(mandir)/man5" mkdir -p "$(DESTDIR)$(mandir)/man7" -- 2.0.0