[PATCH] doc: build man pages at build time, not install

diff --git a/ee/1f5ef68ac66ebe32458bc7e8f4ad653cb1bdb8 b/ee/1f5ef68ac66ebe32458bc7e8f4ad653cb1bdb8
new file mode 100644 (file)
index 0000000..0cd34cc
--- /dev/null
+++ b/ee/1f5ef68ac66ebe32458bc7e8f4ad653cb1bdb8
@@ -0,0 +1,93 @@
+Return-Path: <bremner@tethera.net>\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 3F585431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 04:07:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 J5ZJ8gB0MR1i for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Mar 2014 04:07:30 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5DCD6431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 04:07:30 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WMy3K-0001AH-Fj; Mon, 10 Mar 2014 08:07:26 -0300\r
+Received: (nullmailer pid 14774 invoked by uid 1000); Mon, 10 Mar 2014\r
+       11:07:22 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] doc: build man pages at build time, not install\r
+Date: Mon, 10 Mar 2014 08:07:13 -0300\r
+Message-Id: <1394449633-14737-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\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: Mon, 10 Mar 2014 11:07:34 -0000\r
+\r
+This helps avoid build artifacts (namely, nroff and gzipped-nroff man\r
+pages) owned by root.\r
+---\r
+ Makefile.local     | 2 +-\r
+ doc/Makefile.local | 6 ++++--\r
+ 2 files changed, 5 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 5f797ad..cb7b106 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -53,7 +53,7 @@ endif\r
+ FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS)\r
+ \r
+ .PHONY: all\r
+-all: notmuch notmuch-shared\r
++all: notmuch notmuch-shared build-man\r
+ ifeq ($(MAKECMDGOALS),)\r
+ ifeq ($(shell cat .first-build-message 2>/dev/null),)\r
+       @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all\r
+diff --git a/doc/Makefile.local b/doc/Makefile.local\r
+index fd64f70..5be49dc 100644\r
+--- a/doc/Makefile.local\r
++++ b/doc/Makefile.local\r
+@@ -16,7 +16,7 @@ ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(dir)\r
+ .PHONY: sphinx-html sphinx-man sphinx-texinfo sphinx-info\r
+ .PHONY: rst2man\r
+ \r
+-.PHONY: install-man\r
++.PHONY: install-man build-man\r
+ \r
+ %.gz: %\r
+       rm -f $@ && gzip --stdout $^ > $@\r
+@@ -43,7 +43,9 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})\r
+ \r
+ ${MAN_ROFF_FILES} : sphinx-man\r
+ \r
+-install-man: ${MAN_GZIP_FILES}\r
++build-man: ${MAN_GZIP_FILES}\r
++\r
++install-man: build-man\r
+       mkdir -p "$(DESTDIR)$(mandir)/man1"\r
+       mkdir -p "$(DESTDIR)$(mandir)/man5"\r
+       mkdir -p "$(DESTDIR)$(mandir)/man7"\r
+-- \r
+1.8.5.3\r
+\r