From: Bruno Haible Date: Sun, 16 Nov 2003 15:38:58 +0000 (+0000) Subject: Rebuild the help2man dependent man pages at "make dist" time. X-Git-Tag: v0.13~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc365ccf6ef58636f10962eac3b3c19c098ac9df;p=thirdparty%2Fgettext.git Rebuild the help2man dependent man pages at "make dist" time. --- diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 1976b7ff1..0c4117174 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,7 @@ +2003-11-16 Bruno Haible + + * configure.ac (man/Makefile): Postprocess with FIX_MAKEFILE_DISTRIB. + 2003-11-13 Bruno Haible * configure.ac (docdir): New variable. diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 72d3ea5a6..01878e734 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -150,7 +150,8 @@ AC_CONFIG_FILES([src/Makefile], AC_CONFIG_FILES([po/Makefile.in]) -AC_CONFIG_FILES([man/Makefile]) +AC_CONFIG_FILES([man/Makefile], + [FIX_MAKEFILE_DISTRIB]) AC_CONFIG_FILES([man/x-to-1]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog index 835b3adc8..5d2435e2e 100644 --- a/gettext-runtime/man/ChangeLog +++ b/gettext-runtime/man/ChangeLog @@ -1,3 +1,11 @@ +2003-11-16 Bruno Haible + + * x-to-1.in: Support --update option. + * Makefile.am (UPDATEMODE): New variable. + (gettext.1.in, ngettext.1.in, envsubst.1): Pass it to x-to-1. + (update-man1): New rule. + (distdir): Depend on it. + 2003-11-16 Bruno Haible * Makefile.am: Let gettext.1.in and ngettext.1.in, not gettext.1 and diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am index ef235b999..e8ca9ee57 100644 --- a/gettext-runtime/man/Makefile.am +++ b/gettext-runtime/man/Makefile.am @@ -90,16 +90,25 @@ ngettext.1: ngettext.1.in Makefile mv t-$@ $@ gettext.1.in: gettext.x - IN_HELP2MAN=1 $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/gettext$(EXEEXT) $(srcdir)/gettext.x gettext.1.in + IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/gettext$(EXEEXT) $(srcdir)/gettext.x gettext.1.in ngettext.1.in: ngettext.x - IN_HELP2MAN=1 $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/ngettext$(EXEEXT) $(srcdir)/ngettext.x ngettext.1.in + IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/ngettext$(EXEEXT) $(srcdir)/ngettext.x ngettext.1.in envsubst.1: envsubst.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1 # Depend on version.sh to get version number changes. $(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../version.sh +# Update them also during "make dist", in order to propagate added command +# line options that were added, even if version.sh didn't change. +UPDATEMODE = +update-man1: + $(MAKE) $(man_MAN1IN) $(man_MAN1OTHER) UPDATEMODE=--update + $(MAKE) +# Hidden from automake, but really activated. Works around an automake-1.5 bug. +#distdir: update-man1 + gettext.3: gettext.3.in $(top_srcdir)/../version.sh sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@ mv t-$@ $@ diff --git a/gettext-runtime/man/x-to-1.in b/gettext-runtime/man/x-to-1.in index c26843bd3..310629348 100644 --- a/gettext-runtime/man/x-to-1.in +++ b/gettext-runtime/man/x-to-1.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2001 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,8 +20,16 @@ # This program creates a program's manual from the .x skeleton and its --help # output. +update= +while true; do + case "$1" in + --update) update=yes;; + *) break;; + esac +done + if test $# != 5; then - echo "Usage: x-to-1 PERL HELP2MAN executable program.x program.1" 1>&2 + echo "Usage: x-to-1 [OPTIONS] PERL HELP2MAN executable program.x program.1" 1>&2 exit 1 fi PERL="$1" @@ -37,7 +45,16 @@ if test @CROSS_COMPILING@ = no && test -f $executable && test $perlok = yes; the echo "$HELP2MAN --include=$aux $executable > $output" rm -f t-$progname.1 $HELP2MAN --include=$aux $executable > t-$progname.1 || exit 1 - mv t-$progname.1 $output + if test -n "$update"; then + # In --update mode, don't overwrite the output if nothing would change. + if cmp t-$progname.1 $output >/dev/null 2>&1; then + rm -f t-$progname.1 + else + mv t-$progname.1 $output + fi + else + mv t-$progname.1 $output + fi else echo "WARNING: The man page $output cannot be updated yet." fi diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 4efcd3669..84a353f41 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,7 @@ +2003-11-16 Bruno Haible + + * configure.ac (man/Makefile): Postprocess with FIX_MAKEFILE_DISTRIB. + 2003-11-16 Bruno Haible * windows/gettextpo.rc: Bump version number to 0.13. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 26afc7d46..6587b8da5 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -266,7 +266,8 @@ AC_CONFIG_FILES([misc/Makefile]) AC_CONFIG_FILES([misc/gettextize], [chmod a+x misc/gettextize]) AC_CONFIG_FILES([misc/autopoint], [chmod a+x misc/autopoint]) -AC_CONFIG_FILES([man/Makefile]) +AC_CONFIG_FILES([man/Makefile], + [FIX_MAKEFILE_DISTRIB]) AC_CONFIG_FILES([man/x-to-1]) AC_CONFIG_FILES([m4/Makefile]) diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog index 857dc2aef..168c6519d 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/man/ChangeLog @@ -1,3 +1,14 @@ +2003-11-16 Bruno Haible + + * x-to-1.in: Support --update option. + * Makefile.am (UPDATEMODE): New variable. + (msgcmp.1, msgfmt.1, msgmerge.1, msgunfmt.1, xgettext.1, msgattrib.1, + msgcat.1, msgcomm.1, msgconv.1, msgen.1, msgexec.1, msgfilter.1, + msggrep.1, msginit.1, msguniq.1, gettextize.1, autopoint.1): Pass it to + x-to-1. + (update-man1): New rule. + (distdir): Depend on it. + 2003-11-13 Bruno Haible * Makefile.am (docdir): Use the value from the configure script. diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am index a9406ed56..47968cce6 100644 --- a/gettext-tools/man/Makefile.am +++ b/gettext-tools/man/Makefile.am @@ -80,44 +80,53 @@ uninstall-local: uninstall-html # "progname --help" output. msgcmp.1: msgcmp.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgcmp$(EXEEXT) $(srcdir)/msgcmp.x msgcmp.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcmp$(EXEEXT) $(srcdir)/msgcmp.x msgcmp.1 msgfmt.1: msgfmt.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgfmt$(EXEEXT) $(srcdir)/msgfmt.x msgfmt.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfmt$(EXEEXT) $(srcdir)/msgfmt.x msgfmt.1 msgmerge.1: msgmerge.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgmerge$(EXEEXT) $(srcdir)/msgmerge.x msgmerge.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgmerge$(EXEEXT) $(srcdir)/msgmerge.x msgmerge.1 msgunfmt.1: msgunfmt.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgunfmt$(EXEEXT) $(srcdir)/msgunfmt.x msgunfmt.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgunfmt$(EXEEXT) $(srcdir)/msgunfmt.x msgunfmt.1 xgettext.1: xgettext.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/xgettext$(EXEEXT) $(srcdir)/xgettext.x xgettext.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/xgettext$(EXEEXT) $(srcdir)/xgettext.x xgettext.1 msgattrib.1: msgattrib.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgattrib$(EXEEXT) $(srcdir)/msgattrib.x msgattrib.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgattrib$(EXEEXT) $(srcdir)/msgattrib.x msgattrib.1 msgcat.1: msgcat.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgcat$(EXEEXT) $(srcdir)/msgcat.x msgcat.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcat$(EXEEXT) $(srcdir)/msgcat.x msgcat.1 msgcomm.1: msgcomm.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgcomm$(EXEEXT) $(srcdir)/msgcomm.x msgcomm.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcomm$(EXEEXT) $(srcdir)/msgcomm.x msgcomm.1 msgconv.1: msgconv.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgconv$(EXEEXT) $(srcdir)/msgconv.x msgconv.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgconv$(EXEEXT) $(srcdir)/msgconv.x msgconv.1 msgen.1: msgen.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgen$(EXEEXT) $(srcdir)/msgen.x msgen.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgen$(EXEEXT) $(srcdir)/msgen.x msgen.1 msgexec.1: msgexec.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1 msgfilter.1: msgfilter.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgfilter$(EXEEXT) $(srcdir)/msgfilter.x msgfilter.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfilter$(EXEEXT) $(srcdir)/msgfilter.x msgfilter.1 msggrep.1: msggrep.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1 msginit.1: msginit.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msginit$(EXEEXT) $(srcdir)/msginit.x msginit.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msginit$(EXEEXT) $(srcdir)/msginit.x msginit.1 msguniq.1: msguniq.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1 gettextize.1: gettextize.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../misc/gettextize $(srcdir)/gettextize.x gettextize.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/gettextize $(srcdir)/gettextize.x gettextize.1 autopoint.1: autopoint.x - $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1 + $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1 # Depend on version.sh to get version number changes. $(man_MAN1): help2man $(top_srcdir)/../version.sh +# Update them also during "make dist", in order to propagate added command +# line options that were added, even if version.sh didn't change. +UPDATEMODE = +update-man1: + $(MAKE) $(man_MAN1) UPDATEMODE=--update + $(MAKE) +# Hidden from automake, but really activated. Works around an automake-1.5 bug. +#distdir: update-man1 + # Man pages in HTML format. diff --git a/gettext-tools/man/x-to-1.in b/gettext-tools/man/x-to-1.in index c26843bd3..310629348 100644 --- a/gettext-tools/man/x-to-1.in +++ b/gettext-tools/man/x-to-1.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2001 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,8 +20,16 @@ # This program creates a program's manual from the .x skeleton and its --help # output. +update= +while true; do + case "$1" in + --update) update=yes;; + *) break;; + esac +done + if test $# != 5; then - echo "Usage: x-to-1 PERL HELP2MAN executable program.x program.1" 1>&2 + echo "Usage: x-to-1 [OPTIONS] PERL HELP2MAN executable program.x program.1" 1>&2 exit 1 fi PERL="$1" @@ -37,7 +45,16 @@ if test @CROSS_COMPILING@ = no && test -f $executable && test $perlok = yes; the echo "$HELP2MAN --include=$aux $executable > $output" rm -f t-$progname.1 $HELP2MAN --include=$aux $executable > t-$progname.1 || exit 1 - mv t-$progname.1 $output + if test -n "$update"; then + # In --update mode, don't overwrite the output if nothing would change. + if cmp t-$progname.1 $output >/dev/null 2>&1; then + rm -f t-$progname.1 + else + mv t-$progname.1 $output + fi + else + mv t-$progname.1 $output + fi else echo "WARNING: The man page $output cannot be updated yet." fi