[LATE NIGHT PATCH] build gzipped apidoc in case have doxygen but not sphinx

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