From: Mathieu Lirzin <mthl@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH 3/4] build: Build man pages in $(srcdir).
Date: Sat, 19 Mar 2016 17:18:05 +0100 [thread overview]
Message-ID: <1458404286-10448-4-git-send-email-mthl@gnu.org> (raw)
In-Reply-To: <1458404286-10448-1-git-send-email-mthl@gnu.org>
Before that the doc/guix.1 rule was always triggered when doing a VPATH
build from a tarball.
* doc.am (sub_commands_mans, dist_man1_MANS): man pages are now
generated in $(srcdir) like the info manual.
(doc/guix.1, doc/guix-%.1): Prepend $(srcdir) to target name.
[BUILD_DAEMON] (doc/guix-daemon.1): Likewise.
---
doc.am | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/doc.am b/doc.am
index 896139f..956ac1f 100644
--- a/doc.am
+++ b/doc.am
@@ -99,25 +99,25 @@ dvi-local: ps-local
## ----------- ##
sub_commands_mans = \
- doc/guix-archive.1 \
- doc/guix-build.1 \
- doc/guix-challenge.1 \
- doc/guix-download.1 \
- doc/guix-edit.1 \
- doc/guix-environment.1 \
- doc/guix-gc.1 \
- doc/guix-hash.1 \
- doc/guix-import.1 \
- doc/guix-lint.1 \
- doc/guix-package.1 \
- doc/guix-publish.1 \
- doc/guix-pull.1 \
- doc/guix-refresh.1 \
- doc/guix-size.1 \
- doc/guix-system.1
+ $(srcdir)/doc/guix-archive.1 \
+ $(srcdir)/doc/guix-build.1 \
+ $(srcdir)/doc/guix-challenge.1 \
+ $(srcdir)/doc/guix-download.1 \
+ $(srcdir)/doc/guix-edit.1 \
+ $(srcdir)/doc/guix-environment.1 \
+ $(srcdir)/doc/guix-gc.1 \
+ $(srcdir)/doc/guix-hash.1 \
+ $(srcdir)/doc/guix-import.1 \
+ $(srcdir)/doc/guix-lint.1 \
+ $(srcdir)/doc/guix-package.1 \
+ $(srcdir)/doc/guix-publish.1 \
+ $(srcdir)/doc/guix-pull.1 \
+ $(srcdir)/doc/guix-refresh.1 \
+ $(srcdir)/doc/guix-size.1 \
+ $(srcdir)/doc/guix-system.1
dist_man1_MANS = \
- doc/guix.1 \
+ $(srcdir)/doc/guix.1 \
$(sub_commands_mans)
# Man pages are generated using GNU help2man.
@@ -129,14 +129,14 @@ HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)
# Note: Do not depend on 'scripts/guix' since that would trigger a rebuild
# even for people building from a tarball.
-doc/guix.1: scripts/guix.in $(sub_commands_mans)
+$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans)
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
# Note: The dependency on $(GOBJECTS) is meant to force these docs to be made
# only after all Guile modules have been compiled. The 'case' ensures the man
# pages are only generated if the corresponding script source has been
# changed.
-doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
+$(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
-@case '$?' in \
*$<*) $(AM_V_P) && set -x || echo " HELP2MAN $@"; \
$(gen_man) --output="$@" "guix $*";; \
@@ -145,11 +145,11 @@ doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
if BUILD_DAEMON
-dist_man1_MANS += doc/guix-daemon.1
+dist_man1_MANS += $(srcdir)/doc/guix-daemon.1
# Note: Do not depend on 'guix-daemon' since that would trigger a rebuild even
# for people building from a tarball.
-doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
+$(srcdir)/doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
endif
--
2.7.0
next prev parent reply other threads:[~2016-03-19 16:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-19 16:18 [PATCH 0/4] Build man pages in $(srcdir) Mathieu Lirzin
2016-03-19 16:18 ` [PATCH 1/4] Revert "build: Do not remake doc/guix.1." Mathieu Lirzin
2016-03-19 21:29 ` Ludovic Courtès
2016-03-19 16:18 ` [PATCH 2/4] build: Make 'guix' man page depend on scripts/guix.in Mathieu Lirzin
2016-03-19 21:31 ` Ludovic Courtès
2016-03-19 16:18 ` Mathieu Lirzin [this message]
2016-03-19 21:31 ` [PATCH 3/4] build: Build man pages in $(srcdir) Ludovic Courtès
2016-03-19 16:18 ` [PATCH 4/4] build: Rewrite comments for man pages Mathieu Lirzin
2016-03-19 21:32 ` Ludovic Courtès
2016-03-19 21:28 ` [PATCH 0/4] Build man pages in $(srcdir) Ludovic Courtès
2016-03-19 21:33 ` Ludovic Courtès
2016-03-19 22:50 ` Mathieu Lirzin
2016-03-20 21:09 ` Ludovic Courtès
2016-03-20 23:03 ` Mathieu Lirzin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458404286-10448-4-git-send-email-mthl@gnu.org \
--to=mthl@gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.