From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [Shepherd][PATCH 4/4] doc: Move man pages to the 'doc' directory. Date: Wed, 27 Jan 2016 21:45:34 +0100 Message-ID: <1453927534-32056-5-git-send-email-mthl@gnu.org> References: <1453927534-32056-1-git-send-email-mthl@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.7.0.rc3" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOWye-00080a-17 for guix-devel@gnu.org; Wed, 27 Jan 2016 15:46:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOWyd-0000Sa-3C for guix-devel@gnu.org; Wed, 27 Jan 2016 15:46:07 -0500 In-Reply-To: <1453927534-32056-1-git-send-email-mthl@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.7.0.rc3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * 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(-) --------------2.7.0.rc3 Content-Type: text/x-patch; name="0004-doc-Move-man-pages-to-the-doc-directory.patch" Content-Disposition: inline; filename="0004-doc-Move-man-pages-to-the-doc-directory.patch" Content-Transfer-Encoding: quoted-printable 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_ =3D $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBO= SITY)) AM_V_HELP2MAN_0 =3D @echo " HELP2MAN" $@; =20 HELP2MANFLAGS =3D --source=3DGNU --info-page=3D$(PACKAGE_TARNAME) +gen_man =3D $(AM_V_HELP2MAN)LANGUAGE=3D $(HELP2MAN) $(HELP2MANFLAGS) =20 -define man-page-target +doc/shepherd.1: modules/shepherd.scm + $(gen_man) --output=3D"$@" "$(top_builddir)/`basename "$@" .1`" =20 -%.$(1): modules/shepherd/scripts/%.scm - -$$(AM_V_HELP2MAN)LANGUAGE=3D \ - $(HELP2MAN) --output=3D"$$@" --section=3D$(1) \ - $(HELP2MANFLAGS) \ - "$(top_builddir)/`basename "$$@" .$(1)`" +doc/%.1: modules/shepherd/scripts/%.scm + $(gen_man) --output=3D"$@" "$(top_builddir)/`basename "$@" .1`" =20 -endef +doc/%.8: modules/shepherd/scripts/%.scm + $(gen_man) --section=3D8 --output=3D"$@" \ + "$(top_builddir)/`basename "$@" .8`" =20 -# 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=3D \ - $(HELP2MAN) --output=3D"$@" $(HELP2MANFLAGS) \ - "$(top_builddir)/shepherd" - -dist_man1_MANS =3D shepherd.1 herd.1 -dist_man8_MANS =3D halt.8 reboot.8 +dist_man1_MANS =3D doc/shepherd.1 doc/herd.1 +dist_man8_MANS =3D doc/halt.8 doc/reboot.8 =20 # Things not automatically included in the distribution. EXTRA_DIST =3D \ --------------2.7.0.rc3--