[SCM] GNU Inetutils branch, master, updated. inetutils-1_7-5-g9163f84

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  9163f840bf57da0f905e8cf374a473c9c9ac7a58 (commit)
      from  69ce7de3970293cd212d8947614bf103377bdda2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=9163f840bf57da0f905e8cf374a473c9c9ac7a58


commit 9163f840bf57da0f905e8cf374a473c9c9ac7a58
Author: Simon Josefsson <address@hidden>
Date:   Thu Dec 17 16:30:36 2009 +0100

    Simplify man page building.

diff --git a/ChangeLog b/ChangeLog
index 29b03bf..e16a24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * man/Makefile.am (all): Change daemon man section from 1 to 8.
        (.h2m.8): Add rule for daemons.
+       (.h2m.1): Invoke new meta-rule 'man'.
+       (man): New meta-rule to invoke help2man, simplified from before.
        * NEWS: Updated.
        Reported by Juergen Daubert <address@hidden>.
 
diff --git a/man/Makefile.am b/man/Makefile.am
index f3df6fb..d83d031 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -174,33 +174,16 @@ uucpd.8: uucpd.h2m $(top_srcdir)/uucpd/uucpd.c 
$(top_srcdir)/configure.ac
 whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
 
 .h2m.1:
-       rm -f $@ address@hidden                                         \
-       && {                                                    \
-               rm -rf tmp;                                     \
-               mkdir tmp;                                      \
-               (cd tmp && $(LN_S) ../../$*/$* $*);             \
-                   $(HELP2MAN)                                 \
-                    --source='$(PACKAGE_STRING)'               \
-                    --include=$(srcdir)/$*.h2m                 \
-                    --output=tmp/$@ tmp/$*;                    \
-       }                                                       \
-       && cp tmp/$@ address@hidden                                     \
-       && rm -rf tmp                                           \
-       && mv address@hidden $@
+       make man TOOL=$* SECTION=1
 
 .h2m.8:
-       rm -f $@ address@hidden                                         \
-       && {                                                    \
-               rm -rf tmp;                                     \
-               mkdir tmp;                                      \
-               (cd tmp && $(LN_S) ../../$*/$* $*);             \
-                       $(HELP2MAN)                             \
-                       --source='$(PACKAGE_STRING)'            \
-                       --include=$(srcdir)/$*.h2m              \
-                       --output=tmp/$@                         \
-                       --section 8                             \
-                       tmp/$*;                                 \
-       }                                                       \
-       && cp tmp/$@ address@hidden                                     \
-       && rm -rf tmp                                           \
-       && mv address@hidden $@
+       make man TOOL=$* SECTION=8
+
+.PHONY: man
+man:
+       $(HELP2MAN)                                     \
+               --source='$(PACKAGE_STRING)'            \
+               --include=$(srcdir)/$(TOOL).h2m         \
+               --output=$(TOOL).$(SECTION)             \
+               --section $(SECTION)                    \
+               ../$(TOOL)/$(TOOL)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    2 ++
 man/Makefile.am |   39 +++++++++++----------------------------
 2 files changed, 13 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
GNU Inetutils