build: Simplify man and HTML documentation generation

Problem reported by Santiago Vila in:
<https://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00024.html>.

diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index 4bbea80342b416d59b4262a0ca40166cb0bcd50f..81a3da560f6c27d9c35a975ebc968171b738571e 100644 (file)
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,19 @@
+2014-05-19  Daiki Ueno  <ueno@gnu.org>
+
+       build: Simplify man and HTML documentation generation
+       Problem reported by Santiago Vila in:
+       <https://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00024.html>.
+       * Makefile.am (man_HTML1GEN): Rename from man_HTMLGEN.
+       (man_HTML1IN): Rename from man_HTMLIN.
+       (man_HTML1OTHER): Rename from man_HTMLOTHER.
+       (man_HTML1): New variable.
+       (man_HTML3): New variable split from man_HTMLOTHER.
+       (gt_man2html): New variable; don't overwrite output if groff fails.
+       ($(man_HTML1GEN)): Don't overwrite output if sed fails.
+       ($(man_HTML1IN)): Rewrite using $(gt_man2html).
+       ($(man_HTML1OTHER)): Rewrite using $(gt_man2html).
+       ($(man_HTML3)): Rewrite using $(gt_man2html).
+
 2014-05-12  Daiki Ueno  <ueno@gnu.org>
 
        * Makefile.am (gettext.1 ngettext.1): Don't try to replace

diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index b05154e3ad2f7fec053bad216e300f44102c211f..2232cfbfc9b85b2d6a440413d31cc48b87cac26c 100644 (file)
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -39,17 +39,20 @@ man_MAN3LINK = dgettext.3 dcgettext.3 dngettext.3 dcngettext.3
 man_MANS = $(man_MAN1)
 notrans_man_MANS = $(man_MAN3) $(man_MAN3LINK)
 
-man_HTMLGEN = gettext.1.html ngettext.1.html
-man_HTMLIN = gettext.1.html.in ngettext.1.html.in
-man_HTMLOTHER = \
-envsubst.1.html \
-gettext.3.html ngettext.3.html \
+man_HTML1GEN = gettext.1.html ngettext.1.html
+man_HTML1IN = gettext.1.html.in ngettext.1.html.in
+man_HTML1OTHER = envsubst.1.html
+man_HTML1 = $(man_HTML1GEN) $(man_HTML1OTHER)
+man_HTML3 = gettext.3.html ngettext.3.html \
 textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
-man_HTML = $(man_HTMLGEN) $(man_HTMLOTHER)
+man_HTML = $(man_HTML1) $(man_HTML3)
 
-EXTRA_DIST += help2man $(man_aux) $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) $(man_HTMLIN) $(man_HTMLOTHER)
-CLEANFILES = $(man_MAN1GEN) $(man_HTMLGEN)
-MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) $(man_HTMLIN) $(man_HTMLOTHER)
+EXTRA_DIST += help2man $(man_aux) $(man_MAN1IN) $(man_MAN1OTHER) \
+$(man_MAN3) $(man_MAN3IN) $(man_MAN3LINK) \
+$(man_HTML1IN) $(man_HTML1OTHER)
+CLEANFILES = $(man_MAN1GEN) $(man_HTML1GEN)
+MAINTAINERCLEANFILES = $(man_MAN1IN) $(man_MAN1OTHER) $(man_MAN3) \
+$(man_HTML1IN) $(man_HTML1OTHER) $(man_HTML3)
 
 PERL = @PERL@
 RM = rm -f
@@ -63,6 +66,15 @@ MAN2HTML = groff -mandoc -Thtml
 UPDATEMODE =
 
 
+gt_man2html = \
+       if test -f $${srcdir}$$m; then \
+         $(MAN2HTML) $${srcdir}$$m > t-$@ && \
+         sed -e '/CreationDate:/d' < t-$@ > t2-$@ && \
+         mv t2-$@ $@; \
+         rm -f t-$@ t2-$@; \
+       fi
+
+
 # We distribute both the man pages and their HTML equivalent.
 # The user can generate the parts, via
 #   make man
@@ -81,80 +93,83 @@ uninstall-local: uninstall-html
 # not the binary; we don't need to regenerate the binary when any
 # source file changes, only the main one.
 
-gettext.1 ngettext.1: Makefile
+$(man_MAN1GEN): Makefile
        srcdir=''; \
        test -f ./$@.in || srcdir=$(srcdir)/; \
        if test -f $${srcdir}$@.in; then \
-         sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@; \
+         sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@ && \
          mv t-$@ $@; \
         fi
+
 gettext.1: gettext.1.in
 ngettext.1: ngettext.1.in
 
+$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
+       progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
+       IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
+         ../src/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
+
 gettext.1.in: gettext.x ../src/gettext.c
-       IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/gettext$(EXEEXT) $(srcdir)/gettext.x gettext.1.in
 ngettext.1.in: ngettext.x ../src/ngettext.c
-       IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/ngettext$(EXEEXT) $(srcdir)/ngettext.x ngettext.1.in
-
 envsubst.1: envsubst.x ../src/envsubst.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1
-
-$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
 
-gettext.3: gettext.3.in $(top_srcdir)/../.version
-       sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
-       mv t-$@ $@
-ngettext.3: ngettext.3.in $(top_srcdir)/../.version
-       sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
-       mv t-$@ $@
-textdomain.3: textdomain.3.in $(top_srcdir)/../.version
-       sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
-       mv t-$@ $@
-bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../.version
-       sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
-       mv t-$@ $@
-bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../.version
-       sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
+$(man_MAN3): $(top_srcdir)/../.version
+       sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/$@.in > t-$@ && \
        mv t-$@ $@
 
+gettext.3: gettext.3.in
+ngettext.3: ngettext.3.in
+textdomain.3: textdomain.3.in
+bindtextdomain.3: bindtextdomain.3.in
+bind_textdomain_codeset.3: bind_textdomain_codeset.3.in
+
 
 # Man pages in HTML format.
 
 html-local: $(man_HTML)
 
-gettext.1.html: gettext.1.html.in Makefile
-       sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f gettext.1.html.in; then echo .; else echo $(srcdir); fi`/gettext.1.html.in > t-$@
-       mv t-$@ $@
-ngettext.1.html: ngettext.1.html.in Makefile
-       sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f ngettext.1.html.in; then echo .; else echo $(srcdir); fi`/ngettext.1.html.in > t-$@
-       mv t-$@ $@
+$(man_HTML1GEN): Makefile
+       srcdir=''; \
+       test -f ./$@.in || srcdir=$(srcdir)/; \
+       if test -f $${srcdir}$@.in; then \
+         sed -e 's|@''localedir''@|$(localedir)|g' $${srcdir}$@.in > t-$@ && \
+         mv t-$@ $@; \
+        fi
+
+gettext.1.html: gettext.1.html.in
+ngettext.1.html: ngettext.1.html.in
+
+$(man_HTML1IN):
+       srcdir=''; \
+       progname=`echo $@ | sed -e 's/\.1\.html\.in$$//'`; \
+       m=$${progname}.1.in; \
+       test -f ./$$m || srcdir=$(srcdir)/; \
+       $(gt_man2html)
 
 gettext.1.html.in: gettext.1.in
-       $(MAN2HTML) `if test -f gettext.1.in; then echo .; else echo $(srcdir); fi`/gettext.1.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 ngettext.1.html.in: ngettext.1.in
-       $(MAN2HTML) `if test -f ngettext.1.in; then echo .; else echo $(srcdir); fi`/ngettext.1.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
+
+$(man_HTML1OTHER):
+       srcdir=''; \
+       progname=`echo $@ | sed -e 's/\.1\.html$$//'`; \
+       m=$${progname}.1; \
+       test -f ./$$m || srcdir=$(srcdir)/; \
+       $(gt_man2html)
 
 envsubst.1.html: envsubst.1
-       $(MAN2HTML) `if test -f envsubst.1; then echo .; else echo $(srcdir); fi`/envsubst.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
+
+$(man_HTML3):
+       srcdir=''; \
+       progname=`echo $@ | sed -e 's/\.3\.html$$//'`; \
+       m=$${progname}.3.in; \
+       test -f ./$$m || srcdir=$(srcdir)/; \
+       $(gt_man2html)
 
 gettext.3.html: gettext.3.in
-       $(MAN2HTML) $(srcdir)/gettext.3.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 ngettext.3.html: ngettext.3.in
-       $(MAN2HTML) $(srcdir)/ngettext.3.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 textdomain.3.html: textdomain.3.in
-       $(MAN2HTML) $(srcdir)/textdomain.3.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 bindtextdomain.3.html: bindtextdomain.3.in
-       $(MAN2HTML) $(srcdir)/bindtextdomain.3.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
-       $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 
 install-html-local:
        $(MKDIR_P) $(DESTDIR)$(htmldir)

diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index b0c5b0601b8f864bfc19501e07996c303fc8a52b..06830a679a998070f6c908812a8ea8762f60fd80 100644 (file)
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,15 @@
+2014-05-19  Daiki Ueno  <ueno@gnu.org>
+
+       build: Simplify man and HTML documentation generation
+       Problem reported by Santiago Vila in:
+       <https://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00024.html>.
+       * Makefile.am (man_MAN1SRC): New variable; rename from man_MAN1OTHER.
+       (man_MAN1MISC): New variable; split from man_MAN1OTHER.
+       (gt_man2html): New variable; don't overwrite output if groff fails.
+       ($(man_MAN1SRC)): Factor out the common generation logic.
+       ($(man_MAN1MISC)): Likewise.
+       ($(man_HTML)): Rewrite using $(gt_man2html).
+
 2014-04-22  Daiki Ueno  <ueno@gnu.org>
 
        * Makefile.am: Refer to .version instead of version.sh.

diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index b0d88b0a44a2dc2d87d57e42ff9453585f989bc1..fa5d2412278039620079325d46388bfc35dc5bf0 100644 (file)
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -26,29 +26,32 @@ EXTRA_DIST =
 
 man_aux = \
 msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \
-msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x \
+msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x \
+msggrep.x msginit.x msguniq.x \
 recode-sr-latin.x \
 gettextize.x autopoint.x
 
 # Likewise.
 
-man_MAN1OTHER = \
+man_MAN1SRC = \
 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 \
-recode-sr-latin.1 \
+msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 \
+msggrep.1 msginit.1 msguniq.1 \
+recode-sr-latin.1
+man_MAN1MISC = \
 gettextize.1 autopoint.1
-man_MAN1 = $(man_MAN1OTHER)
+man_MAN1 = $(man_MAN1SRC) $(man_MAN1MISC)
 man_MANS = $(man_MAN1)
 
-man_HTMLOTHER = \
+man_HTML = \
 msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
-msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
+msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html \
+msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
 recode-sr-latin.1.html \
 gettextize.1.html autopoint.1.html
-man_HTML = $(man_HTMLOTHER)
 
-EXTRA_DIST += help2man $(man_aux) $(man_MAN1OTHER) $(man_HTMLOTHER) ChangeLog.0
-MAINTAINERCLEANFILES = $(man_MAN1OTHER) $(man_HTMLOTHER)
+EXTRA_DIST += help2man $(man_aux) $(man_MANS) $(man_HTML) ChangeLog.0
+MAINTAINERCLEANFILES = $(man_MANS) $(man_HTML)
 
 PERL = @PERL@
 RM = rm -f
@@ -62,6 +65,15 @@ MAN2HTML = groff -mandoc -Thtml
 UPDATEMODE =
 
 
+gt_man2html = \
+       if test -f $${srcdir}$$m; then \
+         $(MAN2HTML) $${srcdir}$$m > t-$@ && \
+         sed -e '/CreationDate:/d' < t-$@ > t2-$@ && \
+         mv t2-$@ $@; \
+         rm -f t-$@ t2-$@; \
+       fi
+
+
 # We distribute both the man pages and their HTML equivalent.
 # The user can generate the parts, via
 #   make man
@@ -80,105 +92,66 @@ uninstall-local: uninstall-html
 # binary; we don't need to regenerate the binary when any source file
 # changes, only the main one.
 
+$(man_MAN1SRC): help2man $(top_srcdir)/../.version
+       progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
+       IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
+         ../src/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
+
 msgcmp.1: msgcmp.x ../src/msgcmp.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcmp$(EXEEXT) $(srcdir)/msgcmp.x msgcmp.1
 msgfmt.1: msgfmt.x ../src/msgfmt.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfmt$(EXEEXT) $(srcdir)/msgfmt.x msgfmt.1
 msgmerge.1: msgmerge.x ../src/msgmerge.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgmerge$(EXEEXT) $(srcdir)/msgmerge.x msgmerge.1
 msgunfmt.1: msgunfmt.x ../src/msgunfmt.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgunfmt$(EXEEXT) $(srcdir)/msgunfmt.x msgunfmt.1
 xgettext.1: xgettext.x ../src/xgettext.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/xgettext$(EXEEXT) $(srcdir)/xgettext.x xgettext.1
 msgattrib.1: msgattrib.x ../src/msgattrib.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgattrib$(EXEEXT) $(srcdir)/msgattrib.x msgattrib.1
 msgcat.1: msgcat.x ../src/msgcat.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcat$(EXEEXT) $(srcdir)/msgcat.x msgcat.1
 msgcomm.1: msgcomm.x ../src/msgcomm.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgcomm$(EXEEXT) $(srcdir)/msgcomm.x msgcomm.1
 msgconv.1: msgconv.x ../src/msgconv.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgconv$(EXEEXT) $(srcdir)/msgconv.x msgconv.1
 msgen.1: msgen.x ../src/msgen.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgen$(EXEEXT) $(srcdir)/msgen.x msgen.1
 msgexec.1: msgexec.x ../src/msgexec.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1
 msgfilter.1: msgfilter.x ../src/msgfilter.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msgfilter$(EXEEXT) $(srcdir)/msgfilter.x msgfilter.1
 msggrep.1: msggrep.x ../src/msggrep.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1
 msginit.1: msginit.x ../src/msginit.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msginit$(EXEEXT) $(srcdir)/msginit.x msginit.1
 msguniq.1: msguniq.x ../src/msguniq.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1
 recode-sr-latin.1: recode-sr-latin.x ../src/recode-sr-latin.c
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/recode-sr-latin$(EXEEXT) $(srcdir)/recode-sr-latin.x recode-sr-latin.1
+
+$(man_MAN1MISC): help2man $(top_srcdir)/../.version
+       progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
+       IN_HELP2MAN=1 $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" \
+         ../misc/$${progname}$(EXEEXT) $(srcdir)/$${progname}.x $@
 
 gettextize.1: gettextize.x ../misc/gettextize.in
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/gettextize $(srcdir)/gettextize.x gettextize.1
 autopoint.1: autopoint.x ../misc/autopoint.in
-       $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1
-
-$(man_MAN1): help2man $(top_srcdir)/../.version
 
 
 # Man pages in HTML format.
 
 html-local: $(man_HTML)
 
+$(man_HTML):
+       srcdir=''; \
+       progname=`echo $@ | sed -e 's/\.1\.html$$//'`; \
+       m=$${progname}.1; \
+       test -f ./$$m || srcdir=$(srcdir)/; \
+       $(gt_man2html)
+
 msgcmp.1.html: msgcmp.1
-       $(MAN2HTML) `if test -f msgcmp.1; then echo .; else echo $(srcdir); fi`/msgcmp.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgfmt.1.html: msgfmt.1
-       $(MAN2HTML) `if test -f msgfmt.1; then echo .; else echo $(srcdir); fi`/msgfmt.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgmerge.1.html: msgmerge.1
-       $(MAN2HTML) `if test -f msgmerge.1; then echo .; else echo $(srcdir); fi`/msgmerge.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgunfmt.1.html: msgunfmt.1
-       $(MAN2HTML) `if test -f msgunfmt.1; then echo .; else echo $(srcdir); fi`/msgunfmt.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 xgettext.1.html: xgettext.1
-       $(MAN2HTML) `if test -f xgettext.1; then echo .; else echo $(srcdir); fi`/xgettext.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgattrib.1.html: msgattrib.1
-       $(MAN2HTML) `if test -f msgattrib.1; then echo .; else echo $(srcdir); fi`/msgattrib.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgcat.1.html: msgcat.1
-       $(MAN2HTML) `if test -f msgcat.1; then echo .; else echo $(srcdir); fi`/msgcat.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgcomm.1.html: msgcomm.1
-       $(MAN2HTML) `if test -f msgcomm.1; then echo .; else echo $(srcdir); fi`/msgcomm.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgconv.1.html: msgconv.1
-       $(MAN2HTML) `if test -f msgconv.1; then echo .; else echo $(srcdir); fi`/msgconv.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgen.1.html: msgen.1
-       $(MAN2HTML) `if test -f msgen.1; then echo .; else echo $(srcdir); fi`/msgen.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgexec.1.html: msgexec.1
-       $(MAN2HTML) `if test -f msgexec.1; then echo .; else echo $(srcdir); fi`/msgexec.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msgfilter.1.html: msgfilter.1
-       $(MAN2HTML) `if test -f msgfilter.1; then echo .; else echo $(srcdir); fi`/msgfilter.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msggrep.1.html: msggrep.1
-       $(MAN2HTML) `if test -f msggrep.1; then echo .; else echo $(srcdir); fi`/msggrep.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msginit.1.html: msginit.1
-       $(MAN2HTML) `if test -f msginit.1; then echo .; else echo $(srcdir); fi`/msginit.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 msguniq.1.html: msguniq.1
-       $(MAN2HTML) `if test -f msguniq.1; then echo .; else echo $(srcdir); fi`/msguniq.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 recode-sr-latin.1.html: recode-sr-latin.1
-       $(MAN2HTML) `if test -f recode-sr-latin.1; then echo .; else echo $(srcdir); fi`/recode-sr-latin.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 gettextize.1.html: gettextize.1
-       $(MAN2HTML) `if test -f gettextize.1; then echo .; else echo $(srcdir); fi`/gettextize.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 autopoint.1.html: autopoint.1
-       $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
-       mv t-$@ $@
 
 install-html-local:
        $(MKDIR_P) $(DESTDIR)$(htmldir)