1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 3F585431FBD
\r
6 for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 04:07:34 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id J5ZJ8gB0MR1i for <notmuch@notmuchmail.org>;
\r
16 Mon, 10 Mar 2014 04:07:30 -0700 (PDT)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 5DCD6431FBC
\r
21 for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 04:07:30 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WMy3K-0001AH-Fj; Mon, 10 Mar 2014 08:07:26 -0300
\r
25 Received: (nullmailer pid 14774 invoked by uid 1000); Mon, 10 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH] doc: build man pages at build time, not install
\r
30 Date: Mon, 10 Mar 2014 08:07:13 -0300
\r
31 Message-Id: <1394449633-14737-1-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.5.3
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.13
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Mon, 10 Mar 2014 11:07:34 -0000
\r
47 This helps avoid build artifacts (namely, nroff and gzipped-nroff man
\r
48 pages) owned by root.
\r
50 Makefile.local | 2 +-
\r
51 doc/Makefile.local | 6 ++++--
\r
52 2 files changed, 5 insertions(+), 3 deletions(-)
\r
54 diff --git a/Makefile.local b/Makefile.local
\r
55 index 5f797ad..cb7b106 100644
\r
56 --- a/Makefile.local
\r
57 +++ b/Makefile.local
\r
58 @@ -53,7 +53,7 @@ endif
\r
59 FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS)
\r
62 -all: notmuch notmuch-shared
\r
63 +all: notmuch notmuch-shared build-man
\r
64 ifeq ($(MAKECMDGOALS),)
\r
65 ifeq ($(shell cat .first-build-message 2>/dev/null),)
\r
66 @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
\r
67 diff --git a/doc/Makefile.local b/doc/Makefile.local
\r
68 index fd64f70..5be49dc 100644
\r
69 --- a/doc/Makefile.local
\r
70 +++ b/doc/Makefile.local
\r
71 @@ -16,7 +16,7 @@ ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(dir)
\r
72 .PHONY: sphinx-html sphinx-man sphinx-texinfo sphinx-info
\r
75 -.PHONY: install-man
\r
76 +.PHONY: install-man build-man
\r
79 rm -f $@ && gzip --stdout $^ > $@
\r
80 @@ -43,7 +43,9 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})
\r
82 ${MAN_ROFF_FILES} : sphinx-man
\r
84 -install-man: ${MAN_GZIP_FILES}
\r
85 +build-man: ${MAN_GZIP_FILES}
\r
87 +install-man: build-man
\r
88 mkdir -p "$(DESTDIR)$(mandir)/man1"
\r
89 mkdir -p "$(DESTDIR)$(mandir)/man5"
\r
90 mkdir -p "$(DESTDIR)$(mandir)/man7"
\r