all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Mathieu Lirzin <mthl@gnu.org>
To: guix-devel@gnu.org
Subject: [Shepherd][PATCH 4/4] doc: Move man pages to the 'doc' directory.
Date: Wed, 27 Jan 2016 21:45:34 +0100	[thread overview]
Message-ID: <1453927534-32056-5-git-send-email-mthl@gnu.org> (raw)
In-Reply-To: <1453927534-32056-1-git-send-email-mthl@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]


* Makefile.am (man-page-target): Delete function.
(dist_man1_MANS, dist_man8_MANS): Prefix each element with 'doc/'.
(shepherd.1): Rename to ...
(doc/shepherd.1): ... this.
(doc/%.1, doc/%.8): New targets.
(gen_man): New variable.
* .gitignore: Update it.
---
 .gitignore  |  4 ++--
 Makefile.am | 27 ++++++++++-----------------
 2 files changed, 12 insertions(+), 19 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-doc-Move-man-pages-to-the-doc-directory.patch --]
[-- Type: text/x-patch; name="0004-doc-Move-man-pages-to-the-doc-directory.patch", Size: 1833 bytes --]

diff --git a/.gitignore b/.gitignore
index 111817f..632dafe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@
 *~
 ,*
 .dirstamp
-/*.1
-/*.8
 /INSTALL
 /aclocal.m4
 /autom4te.cache
@@ -13,6 +11,8 @@
 /config.scm
 /config.status
 /configure
+/doc/*.1
+/doc/*.8
 /doc/shepherd.info
 /doc/stamp-vti
 /doc/version.texi
diff --git a/Makefile.am b/Makefile.am
index 52f66d6..41c0f47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,27 +74,20 @@ AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY))
 AM_V_HELP2MAN_0 = @echo "  HELP2MAN" $@;
 
 HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)
+gen_man = $(AM_V_HELP2MAN)LANGUAGE= $(HELP2MAN) $(HELP2MANFLAGS)
 
-define man-page-target
+doc/shepherd.1: modules/shepherd.scm
+	$(gen_man) --output="$@" "$(top_builddir)/`basename "$@" .1`"
 
-%.$(1): modules/shepherd/scripts/%.scm
-	-$$(AM_V_HELP2MAN)LANGUAGE=				\
-	  $(HELP2MAN) --output="$$@" --section=$(1)		\
-	              $(HELP2MANFLAGS)				\
-	              "$(top_builddir)/`basename "$$@" .$(1)`"
+doc/%.1: modules/shepherd/scripts/%.scm
+	$(gen_man) --output="$@" "$(top_builddir)/`basename "$@" .1`"
 
-endef
+doc/%.8: modules/shepherd/scripts/%.scm
+	$(gen_man) --section=8 --output="$@"	\
+	  "$(top_builddir)/`basename "$@" .8`"
 
-# Create targets for sections 1 and 8.
-$(eval $(foreach section,1 8,$(call man-page-target,$(section))))
-
-shepherd.1: modules/shepherd.scm
-	-$(AM_V_HELP2MAN)LANGUAGE=			\
-	  $(HELP2MAN) --output="$@" $(HELP2MANFLAGS)	\
-	              "$(top_builddir)/shepherd"
-
-dist_man1_MANS = shepherd.1 herd.1
-dist_man8_MANS = halt.8 reboot.8
+dist_man1_MANS = doc/shepherd.1 doc/herd.1
+dist_man8_MANS = doc/halt.8 doc/reboot.8
 
 # Things not automatically included in the distribution.
 EXTRA_DIST =				\

  parent reply	other threads:[~2016-01-27 20:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-27 20:45 [Shepherd][PATCH 0/4] Move documentation to a 'doc' directory Mathieu Lirzin
2016-01-27 20:45 ` [Shepherd][PATCH 1/4] build: Build Guile objects before generating man pages Mathieu Lirzin
2016-01-27 22:55   ` Ludovic Courtès
2016-01-27 23:15     ` Mathieu Lirzin
2016-01-28  9:09       ` Ludovic Courtès
2016-01-27 20:45 ` [Shepherd][PATCH 2/4] doc: Move examples to the 'doc/examples' directory Mathieu Lirzin
2016-01-27 22:57   ` Ludovic Courtès
2016-01-27 20:45 ` [Shepherd][PATCH 3/4] doc: Move manual to the 'doc' directory Mathieu Lirzin
2016-01-27 22:58   ` Ludovic Courtès
2016-01-27 20:45 ` Mathieu Lirzin [this message]
2016-01-27 22:57   ` [Shepherd][PATCH 4/4] doc: Move man pages " Ludovic Courtès

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=1453927534-32056-5-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.