groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 01/01: To each man page *.man add a section number. Give these i


From: Bernd Warken
Subject: [groff] 01/01: To each man page *.man add a section number. Give these informations to all automake Makefiles *.am.
Date: Sat, 22 Aug 2015 11:30:37 +0000

bwarken pushed a commit to branch master
in repository groff.

commit 929dfe4b3bbc2c3ed35f4361c7253e5411332cde
Author: Bernd Warken <address@hidden>
Date:   Sat Aug 22 13:30:16 2015 +0200

    To each man page *.man add a section number.  Give these informations to 
all automake Makefiles *.am.
---
 Makefile.am                                        |   87 +++++++++++++++++++-
 contrib/chem/{chem.man => chem.1.man}              |    0
 contrib/chem/chem.am                               |    6 +-
 .../eqn2graph/{eqn2graph.man => eqn2graph.1.man}   |    0
 contrib/eqn2graph/eqn2graph.am                     |    6 +-
 contrib/gdiffmk/{gdiffmk.man => gdiffmk.1.man}     |    0
 contrib/gdiffmk/gdiffmk.am                         |    6 +-
 .../glilypond/{glilypond.man => glilypond.1.man}   |    0
 contrib/glilypond/glilypond.am                     |    4 +-
 contrib/gperl/{gperl.man => gperl.1.man}           |    0
 contrib/gperl/gperl.am                             |    6 +-
 contrib/gpinyin/{gpinyin.man => gpinyin.1.man}     |    0
 contrib/gpinyin/gpinyin.am                         |    4 +-
 .../{grap2graph.man => grap2graph.1.man}           |    0
 contrib/grap2graph/grap2graph.am                   |    4 +-
 .../{groff_filenames.man => groff_filenames.1.man} |    0
 contrib/groff_filenames/groff_filenames.am         |    4 +-
 contrib/groffer/{groffer.man => groffer.1.man}     |    0
 contrib/groffer/groffer.am                         |   24 +++---
 contrib/groffer/{roff2.man => roff2.1.man}         |    0
 .../hdtbl/{groff_hdtbl.man => groff_hdtbl.7.man}   |    0
 contrib/hdtbl/hdtbl.am                             |    4 +-
 contrib/mm/{groff_mm.man => groff_mm.7.man}        |    0
 contrib/mm/{groff_mmse.man => groff_mmse.7.man}    |    0
 contrib/mm/mm.am                                   |    8 +-
 contrib/mm/{mmroff.man => mmroff.1.man}            |    0
 contrib/mom/{groff_mom.man => groff_mom.7.man}     |    0
 contrib/mom/mom.am                                 |    4 +-
 contrib/pdfmark/pdfmark.am                         |    4 +-
 contrib/pdfmark/{pdfroff.man => pdfroff.1.man}     |    0
 .../pic2graph/{pic2graph.man => pic2graph.1.man}   |    0
 contrib/pic2graph/pic2graph.am                     |    4 +-
 man/{ditroff.man => ditroff.7.man}                 |    0
 man/{groff.man => groff.7.man}                     |    0
 man/{groff_char.man => groff_char.7.man}           |    0
 man/{groff_diff.man => groff_diff.7.man}           |    0
 man/{groff_font.man => groff_font.5.man}           |    0
 man/{groff_out.man => groff_out.5.man}             |    0
 man/{groff_tmac.man => groff_tmac.5.man}           |    0
 man/man.am                                         |   16 ++--
 man/{roff.man => roff.7.man}                       |    0
 src/devices/grodvi/{grodvi.man => grodvi.1.man}    |    0
 src/devices/grodvi/grodvi.am                       |    4 +-
 src/devices/grohtml/{grohtml.man => grohtml.1.man} |    0
 src/devices/grohtml/grohtml.am                     |    4 +-
 src/devices/grolbp/{grolbp.man => grolbp.1.man}    |    0
 src/devices/grolbp/grolbp.am                       |    2 +-
 src/devices/grolj4/{grolj4.man => grolj4.1.man}    |    0
 src/devices/grolj4/grolj4.am                       |    6 +-
 .../grolj4/{lj4_font.man => lj4_font.5.man}        |    0
 src/devices/gropdf/{gropdf.man => gropdf.1.man}    |    0
 src/devices/gropdf/gropdf.am                       |    6 +-
 src/devices/gropdf/{pdfmom.man => pdfmom.1.man}    |    0
 src/devices/grops/{grops.man => grops.1.man}       |    0
 src/devices/grops/grops.am                         |    4 +-
 src/devices/grotty/{grotty.man => grotty.1.man}    |    0
 src/devices/grotty/grotty.am                       |    6 +-
 .../xditview/{gxditview.man => gxditview.1.man}    |    0
 src/devices/xditview/xditview.am                   |    6 +-
 src/preproc/eqn/{eqn.man => eqn.1.man}             |    0
 src/preproc/eqn/eqn.am                             |    6 +-
 src/preproc/eqn/{neqn.man => neqn.1.man}           |    0
 src/preproc/grn/{grn.man => grn.1.man}             |    0
 src/preproc/grn/grn.am                             |    4 +-
 src/preproc/pic/{pic.man => pic.1.man}             |    0
 src/preproc/pic/pic.am                             |    4 +-
 src/preproc/preconv/{preconv.man => preconv.1.man} |    0
 src/preproc/preconv/preconv.am                     |    4 +-
 src/preproc/refer/{refer.man => refer.1.man}       |    0
 src/preproc/refer/refer.am                         |    4 +-
 src/preproc/soelim/{soelim.man => soelim.1.man}    |    0
 src/preproc/soelim/soelim.am                       |    4 +-
 src/preproc/tbl/{tbl.man => tbl.1.man}             |    0
 src/preproc/tbl/tbl.am                             |    4 +-
 src/roff/groff/{groff.man => groff.1.man}          |    0
 src/roff/groff/groff.am                            |    4 +-
 src/roff/grog/{grog.man => grog.1.man}             |    0
 src/roff/grog/grog.am                              |    4 +-
 src/roff/nroff/{nroff.man => nroff.1.man}          |    0
 src/roff/nroff/nroff.am                            |    4 +-
 src/roff/troff/{troff.man => troff.1.man}          |    0
 src/roff/troff/troff.am                            |    4 +-
 .../addftinfo/{addftinfo.man => addftinfo.1.man}   |    0
 src/utils/addftinfo/addftinfo.am                   |    4 +-
 .../afmtodit/{afmtodit.man => afmtodit.1.man}      |    0
 src/utils/afmtodit/afmtodit.am                     |    4 +-
 .../hpftodit/{hpftodit.man => hpftodit.1.man}      |    0
 src/utils/hpftodit/hpftodit.am                     |    4 +-
 src/utils/indxbib/{indxbib.man => indxbib.1.man}   |    0
 src/utils/indxbib/indxbib.am                       |    4 +-
 src/utils/lkbib/{lkbib.man => lkbib.1.man}         |    0
 src/utils/lkbib/lkbib.am                           |    4 +-
 src/utils/lookbib/{lookbib.man => lookbib.1.man}   |    0
 src/utils/lookbib/lookbib.am                       |    4 +-
 src/utils/pfbtops/{pfbtops.man => pfbtops.1.man}   |    0
 src/utils/pfbtops/pfbtops.am                       |    4 +-
 .../tfmtodit/{tfmtodit.man => tfmtodit.1.man}      |    0
 src/utils/tfmtodit/tfmtodit.am                     |    4 +-
 .../xtotroff/{xtotroff.man => xtotroff.1.man}      |    0
 src/utils/xtotroff/xtotroff.am                     |    4 +-
 tmac/{groff_man.man => groff_man.7.man}            |    0
 tmac/{groff_mdoc.man => groff_mdoc.7.man}          |    0
 tmac/{groff_me.man => groff_me.7.man}              |    0
 tmac/{groff_ms.man => groff_ms.7.man}              |    0
 tmac/{groff_trace.man => groff_trace.7.man}        |    0
 tmac/{groff_www.man => groff_www.7.man}            |    0
 tmac/tmac.am                                       |   14 ++--
 107 files changed, 204 insertions(+), 121 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1d991ce..32303c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Original Makefile.in written by James Clark (address@hidden)
 # Migrated to Automake by Bertrand Garrigues
 #
-# Last update: 20 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -856,7 +856,90 @@ MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS) 
$(bin_SCRIPTS) \
 
 # Rule to build .man files. The brackets around the @ are used to prevent the 
 # substitution of the variable by automake. 
-.man.n:
+
+SUFFIXES = .1.man .n
+
+.1.man.n:
+       @echo Making $@ from $<
+       rm -f $@
+       $(MKDIR_P) `dirname address@hidden
+       @LC_ALL=C \
+        sed -e "s|address@hidden@]|$(appresdir)|g" \
+            -e "s|address@hidden@]|$(bindir)|g" \
+            -e "s|address@hidden@]|$(BROKEN_SPOOLER_FLAGS)|g" \
+            -e "s|address@hidden@]|$(common_words_file)|g" \
+            -e "s|address@hidden@]|$(datasubdir)|g" \
+            -e "s|address@hidden@]|$(indexdir)/$(indexname)|g" \
+            -e "s|address@hidden@]|$(indexname)|g" \
+            -e "s|address@hidden@]|$(DEVICE)|g" \
+            -e "s|address@hidden@]|$(docdir)|g" \
+            -e "s|address@hidden@]|$(exampledir)|g" \
+            -e "s|address@hidden@]|$(fontdir)|g" \
+            -e "s|address@hidden@]|$(g)|g" \
+            -e "address@hidden@]!`echo $(g) | tr [a-z] [A-Z]`!g" \
+            -e "s|address@hidden@]|$(htmldocdir)|g" \
+            -e "s|address@hidden@]|$(indexext)|g" \
+            -e "s|address@hidden@]|$(legacyfontdir)|g" \
+            -e "s|address@hidden@]|$(localfontdir)|g" \
+            -e "s|address@hidden@]|$(localtmacdir)|g" \
+            -e "s|address@hidden@]|$(tmacdir)|g" \
+            -e "s|address@hidden@]|$(man1ext)|g" \
+            -e "s|address@hidden@]|$(man5ext)|g" \
+            -e "s|address@hidden@]|$(man7ext)|g" \
+            -e "s|address@hidden@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+            -e "s|address@hidden@]|$(oldfontdir)|g" \
+            -e "s|address@hidden@]|$(pdfdocdir)|g" \
+            -e "s|address@hidden@]|$(systemtmacdir)|g" \
+            -e "s|address@hidden@]|$(tmac_an_prefix)|g" \
+            -e "s|address@hidden@]|$(tmac_m_prefix)|g" \
+            -e "s|address@hidden@]|$(tmacdir)/mm|g" \
+            -e "s|address@hidden@]|$(tmac_s_prefix)|g" \
+            -e "s|address@hidden@]|$(VERSION)|g" \
+        $< >$@
+
+SUFFIXES = .5.man .n
+
+.5.man.n:
+       @echo Making $@ from $<
+       rm -f $@
+       $(MKDIR_P) `dirname address@hidden
+       @LC_ALL=C \
+        sed -e "s|address@hidden@]|$(appresdir)|g" \
+            -e "s|address@hidden@]|$(bindir)|g" \
+            -e "s|address@hidden@]|$(BROKEN_SPOOLER_FLAGS)|g" \
+            -e "s|address@hidden@]|$(common_words_file)|g" \
+            -e "s|address@hidden@]|$(datasubdir)|g" \
+            -e "s|address@hidden@]|$(indexdir)/$(indexname)|g" \
+            -e "s|address@hidden@]|$(indexname)|g" \
+            -e "s|address@hidden@]|$(DEVICE)|g" \
+            -e "s|address@hidden@]|$(docdir)|g" \
+            -e "s|address@hidden@]|$(exampledir)|g" \
+            -e "s|address@hidden@]|$(fontdir)|g" \
+            -e "s|address@hidden@]|$(g)|g" \
+            -e "address@hidden@]!`echo $(g) | tr [a-z] [A-Z]`!g" \
+            -e "s|address@hidden@]|$(htmldocdir)|g" \
+            -e "s|address@hidden@]|$(indexext)|g" \
+            -e "s|address@hidden@]|$(legacyfontdir)|g" \
+            -e "s|address@hidden@]|$(localfontdir)|g" \
+            -e "s|address@hidden@]|$(localtmacdir)|g" \
+            -e "s|address@hidden@]|$(tmacdir)|g" \
+            -e "s|address@hidden@]|$(man1ext)|g" \
+            -e "s|address@hidden@]|$(man5ext)|g" \
+            -e "s|address@hidden@]|$(man7ext)|g" \
+            -e "s|address@hidden@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+            -e "s|address@hidden@]|$(oldfontdir)|g" \
+            -e "s|address@hidden@]|$(pdfdocdir)|g" \
+            -e "s|address@hidden@]|$(systemtmacdir)|g" \
+            -e "s|address@hidden@]|$(tmac_an_prefix)|g" \
+            -e "s|address@hidden@]|$(tmac_m_prefix)|g" \
+            -e "s|address@hidden@]|$(tmacdir)/mm|g" \
+            -e "s|address@hidden@]|$(tmac_s_prefix)|g" \
+            -e "s|address@hidden@]|$(VERSION)|g" \
+        $< >$@
+
+SUFFIXES = .7.man .n
+
+.7.man.n:
        @echo Making $@ from $<
        rm -f $@
        $(MKDIR_P) `dirname address@hidden
diff --git a/contrib/chem/chem.man b/contrib/chem/chem.1.man
similarity index 100%
rename from contrib/chem/chem.man
rename to contrib/chem/chem.1.man
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index d0b2667..671d2b4 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -2,12 +2,12 @@
 
 # File position: <groff-source>/contrib/chem/chem.am
 
-# Copyright (C) 2006-14
+# Copyright (C) 2006-2015
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <address@hidden>.
 # Moved to automake by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of `chem' which is part of `groff'.
 #
@@ -56,7 +56,7 @@ nodist_chemexample122_DATA = contrib/chem/examples/122/README
 endif
 EXTRA_DIST += \
   contrib/chem/ChangeLog \
-  contrib/chem/chem.man \
+  contrib/chem/chem.1.man \
   contrib/chem/chem.pic \
   contrib/chem/chem.pl \
   contrib/chem/README.txt \
diff --git a/contrib/eqn2graph/eqn2graph.man b/contrib/eqn2graph/eqn2graph.1.man
similarity index 100%
rename from contrib/eqn2graph/eqn2graph.man
rename to contrib/eqn2graph/eqn2graph.1.man
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 6f41d1f..89bd76e 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2002-2014
+# Copyright (C) 2002-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
 bin_SCRIPTS += eqn2graph
 man1_MANS += contrib/eqn2graph/eqn2graph.n
 EXTRA_DIST += \
-  contrib/eqn2graph/eqn2graph.man \
+  contrib/eqn2graph/eqn2graph.1.man \
   contrib/eqn2graph/eqn2graph.sh
 
 eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/gdiffmk/gdiffmk.man b/contrib/gdiffmk/gdiffmk.1.man
similarity index 100%
rename from contrib/gdiffmk/gdiffmk.man
rename to contrib/gdiffmk/gdiffmk.1.man
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index ee7ab6a..e6bf07e 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -2,12 +2,12 @@
 #
 # File position: <groff-source>/contrib/gdiffmk/gdiffmk.am
 #
-# Copyright (C) 2004, 2006, 2009, 2014-15
+# Copyright (C) 2004, 2006, 2009, 2014-2015
 #    Free Software Foundation, Inc.
 # Written by Mike Bianchi <address@hidden <mailto:address@hidden>>
 # Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 20 Aug 2015
 #
 # This file is part of the gdiffmk utility, which is part of groff.
 #
@@ -30,7 +30,7 @@ bin_SCRIPTS += gdiffmk
 TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
 man1_MANS += contrib/gdiffmk/gdiffmk.n
 EXTRA_DIST += \
-  contrib/gdiffmk/gdiffmk.man \
+  contrib/gdiffmk/gdiffmk.1.man \
   contrib/gdiffmk/ChangeLog \
   contrib/gdiffmk/README \
   contrib/gdiffmk/gdiffmk.sh \
diff --git a/contrib/glilypond/glilypond.man b/contrib/glilypond/glilypond.1.man
similarity index 100%
rename from contrib/glilypond/glilypond.man
rename to contrib/glilypond/glilypond.1.man
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index 57f8ad4..a831a46 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -8,7 +8,7 @@
 # Bernd Warken <address@hidden>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -41,7 +41,7 @@ dist_glilypond_DATA = \
 EXTRA_DIST += \
   contrib/glilypond/ChangeLog \
   contrib/glilypond/ChangeLog.0x \
-  contrib/glilypond/glilypond.man \
+  contrib/glilypond/glilypond.1.man \
   contrib/glilypond/glilypond.pl \
   contrib/glilypond/README.txt \
   contrib/glilypond/examples/example.groff
diff --git a/contrib/gperl/gperl.man b/contrib/gperl/gperl.1.man
similarity index 100%
rename from contrib/gperl/gperl.man
rename to contrib/gperl/gperl.1.man
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 6aa38d2..6add9f9 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -2,11 +2,11 @@
 
 # File position: <groff-source>/contrib/gperl/gperl.am
 
-# Copyright (C) 2014-15  Free Software Foundation, Inc.
+# Copyright (C) 2014-2015  Free Software Foundation, Inc.
 # Written by Bernd Warken <address@hidden>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 18 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `gperl' which is part of `groff'.
 
@@ -30,7 +30,7 @@ bin_SCRIPTS += gperl
 man1_MANS += contrib/gperl/gperl.n
 EXTRA_DIST += \
   contrib/gperl/ChangeLog \
-  contrib/gperl/gperl.man \
+  contrib/gperl/gperl.1.man \
   contrib/gperl/gperl.pl
 gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
        $(RM) $@
diff --git a/contrib/gpinyin/gpinyin.man b/contrib/gpinyin/gpinyin.1.man
similarity index 100%
rename from contrib/gpinyin/gpinyin.man
rename to contrib/gpinyin/gpinyin.1.man
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 4f7e64a..44596e8 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <address@hidden>.
 # Moved to automake by Bertrand Garrigues
 
-# Last update: 2013 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -34,7 +34,7 @@ dist_gpinyin_DATA = contrib/gpinyin/subs.pl
 man1_MANS += contrib/gpinyin/gpinyin.n
 EXTRA_DIST += \
   contrib/gpinyin/ChangeLog \
-  contrib/gpinyin/gpinyin.man \
+  contrib/gpinyin/gpinyin.1.man \
   contrib/gpinyin/gpinyin.pl
 
 gpinyin: contrib/gpinyin/gpinyin.pl
diff --git a/contrib/grap2graph/grap2graph.man 
b/contrib/grap2graph/grap2graph.1.man
similarity index 100%
rename from contrib/grap2graph/grap2graph.man
rename to contrib/grap2graph/grap2graph.1.man
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index e1a7aea..9a25dab 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2003-2015  Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ bin_SCRIPTS += grap2graph
 man1_MANS += contrib/grap2graph/grap2graph.n
 EXTRA_DIST += \
   $(grap2graph_srcdir)/grap2graph.sh \
-  $(grap2graph_srcdir)/grap2graph.man
+  $(grap2graph_srcdir)/grap2graph.1.man
 grap2graph: $(grap2graph_srcdir)/grap2graph.sh
        sed -e "s|address@hidden@]|$(g)|g" \
            -e "s|address@hidden@]|$(VERSION)|" \
diff --git a/contrib/groff_filenames/groff_filenames.man 
b/contrib/groff_filenames/groff_filenames.1.man
similarity index 100%
rename from contrib/groff_filenames/groff_filenames.man
rename to contrib/groff_filenames/groff_filenames.1.man
diff --git a/contrib/groff_filenames/groff_filenames.am 
b/contrib/groff_filenames/groff_filenames.am
index 0f14ef4..a43cfe1 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -4,7 +4,7 @@
 
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 
 # Written by Bernd Warken <address@hidden>.
 # Automake migration by Bertrand Garrigues
@@ -29,7 +29,7 @@
 man7_MANS += contrib/groff_filenames/groff_filenames.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
-  contrib/groff_filenames/groff_filenames.man
+  contrib/groff_filenames/groff_filenames.1.man
 
 
 ########################################################################
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.1.man
similarity index 100%
rename from contrib/groffer/groffer.man
rename to contrib/groffer/groffer.1.man
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index 87e2493..f3365ed 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -8,7 +8,7 @@
 # Bernd Warken <address@hidden>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -40,12 +40,12 @@ ROFF2PROGS = \
 
 # Generated man templates
 ROFF2MAN = \
-  contrib/groffer/roff2dvi.man \
-  contrib/groffer/roff2html.man \
-  contrib/groffer/roff2pdf.man \
-  contrib/groffer/roff2ps.man \
-  contrib/groffer/roff2text.man \
-  contrib/groffer/roff2x.man
+  contrib/groffer/roff2dvi.1.man \
+  contrib/groffer/roff2html.1.man \
+  contrib/groffer/roff2pdf.1.man \
+  contrib/groffer/roff2ps.1.man \
+  contrib/groffer/roff2text.1.man \
+  contrib/groffer/roff2x.1.man
 
 GROFFER_PERL = \
   contrib/groffer/main_subs.pl \
@@ -54,9 +54,9 @@ GROFFER_PERL = \
   contrib/groffer/subs.pl
 
 GROFFER_REST = \
-  contrib/groffer/roff2.man \
+  contrib/groffer/roff2.1.man \
   contrib/groffer/version.sh \
-  contrib/groffer/groffer.man \
+  contrib/groffer/groffer.1.man \
   contrib/groffer/groffer.pl \
   contrib/groffer/roff2.pl
 
@@ -84,10 +84,10 @@ $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
 
 # we take roff2.man and replace the @ROFF2MODE@ by the type of file
 # (dvi, pdf, html etc ...)
-$(ROFF2MAN):  $(groffer_srcdir)/roff2.man
+$(ROFF2MAN):  $(groffer_srcdir)/roff2.1.man
        @$(MKDIR_P) contrib/groffer
-       FILEMODE=`echo $@ | sed 
's|contrib/groffer/roff2\([a-z][a-z]*\)\.man|\1|g'` \
-         && sed -e 's/address@hidden@]/'"$$FILEMODE"'/g' 
$(groffer_srcdir)/roff2.man > $@;
+       FILEMODE=`echo $@ | sed 
's|contrib/groffer/roff2\([a-z][a-z]*\)\.1\.man|\1|g'` \
+         && sed -e 's/address@hidden@]/'"$$FILEMODE"'/g' 
$(groffer_srcdir)/roff2.1.man > $@;
 
 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
        echo "Using perl version of groffer."; \
diff --git a/contrib/groffer/roff2.man b/contrib/groffer/roff2.1.man
similarity index 100%
rename from contrib/groffer/roff2.man
rename to contrib/groffer/roff2.1.man
diff --git a/contrib/hdtbl/groff_hdtbl.man b/contrib/hdtbl/groff_hdtbl.7.man
similarity index 100%
rename from contrib/hdtbl/groff_hdtbl.man
rename to contrib/hdtbl/groff_hdtbl.7.man
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 61250e2..dd634a1 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -2,7 +2,7 @@
 #      Written by Werner Lemberg (address@hidden)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -97,7 +97,7 @@ MOSTLYCLEANFILES += $(HDTBLGENFILES) 
$(HDTBLPROCESSEDEXAMPLEFILES) \
 EXTRA_DIST += \
   contrib/hdtbl/ChangeLog \
   contrib/hdtbl/TODO \
-  contrib/hdtbl/groff_hdtbl.man \
+  contrib/hdtbl/groff_hdtbl.7.man \
   contrib/hdtbl/hdtbl.tmac-u \
   contrib/hdtbl/hdmisc.tmac-u
 
diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.7.man
similarity index 100%
rename from contrib/mm/groff_mm.man
rename to contrib/mm/groff_mm.7.man
diff --git a/contrib/mm/groff_mmse.man b/contrib/mm/groff_mmse.7.man
similarity index 100%
rename from contrib/mm/groff_mmse.man
rename to contrib/mm/groff_mmse.7.man
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 48929fa..76fdc25 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,7 +1,7 @@
 # Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -57,9 +57,9 @@ EXTRA_DIST += \
   contrib/mm/mm \
   contrib/mm/NOTES \
   contrib/mm/README \
-  contrib/mm/groff_mm.man \
-  contrib/mm/groff_mmse.man \
-  contrib/mm/mmroff.man \
+  contrib/mm/groff_mm.7.man \
+  contrib/mm/groff_mmse.7.man \
+  contrib/mm/mmroff.1.man \
   contrib/mm/mmroff.pl
 
 mmroff: $(mm_srcdir)/mmroff.pl
diff --git a/contrib/mm/mmroff.man b/contrib/mm/mmroff.1.man
similarity index 100%
rename from contrib/mm/mmroff.man
rename to contrib/mm/mmroff.1.man
diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.7.man
similarity index 100%
rename from contrib/mom/groff_mom.man
rename to contrib/mom/groff_mom.7.man
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 503f919..08d1d7d 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -3,7 +3,7 @@
 #      Written by Werner Lemberg (address@hidden)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -119,7 +119,7 @@ EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \
   contrib/mom/NEWS \
   contrib/mom/TODO \
   contrib/mom/copyright \
-  contrib/mom/groff_mom.man \
+  contrib/mom/groff_mom.7.man \
   contrib/mom/om.tmac-u
 
 MOSTLYCLEANFILES += \
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 451c8da..13c1020 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -3,7 +3,7 @@
 #      Written by Keith Marshall (address@hidden)
 #      Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -52,7 +52,7 @@ EXTRA_DIST += \
   contrib/pdfmark/README \
   contrib/pdfmark/PROBLEMS \
   contrib/pdfmark/TODO \
-  contrib/pdfmark/pdfroff.man \
+  contrib/pdfmark/pdfroff.1.man \
   contrib/pdfmark/pdfroff.sh
 
 PDFMARK_PFLAG =-dpaper=$(PAGE) -P-p$(PAGE)
diff --git a/contrib/pdfmark/pdfroff.man b/contrib/pdfmark/pdfroff.1.man
similarity index 100%
rename from contrib/pdfmark/pdfroff.man
rename to contrib/pdfmark/pdfroff.1.man
diff --git a/contrib/pic2graph/pic2graph.man b/contrib/pic2graph/pic2graph.1.man
similarity index 100%
rename from contrib/pic2graph/pic2graph.man
rename to contrib/pic2graph/pic2graph.1.man
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index b8bf261..008cbfd 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -1,6 +1,6 @@
 # Copyright (C) 2001-2015  Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ man1_MANS += contrib/pic2graph/pic2graph.n
 bin_SCRIPTS += pic2graph
 EXTRA_DIST += \
   contrib/pic2graph/pic2graph.sh \
-  contrib/pic2graph/pic2graph.man
+  contrib/pic2graph/pic2graph.1.man
 pic2graph: $(pic2graph_srcdir)/pic2graph.sh
        sed -e "s|address@hidden@]|$(g)|g" \
            -e "s|address@hidden@]|$(VERSION)|" \
diff --git a/man/ditroff.man b/man/ditroff.7.man
similarity index 100%
rename from man/ditroff.man
rename to man/ditroff.7.man
diff --git a/man/groff.man b/man/groff.7.man
similarity index 100%
rename from man/groff.man
rename to man/groff.7.man
diff --git a/man/groff_char.man b/man/groff_char.7.man
similarity index 100%
rename from man/groff_char.man
rename to man/groff_char.7.man
diff --git a/man/groff_diff.man b/man/groff_diff.7.man
similarity index 100%
rename from man/groff_diff.man
rename to man/groff_diff.7.man
diff --git a/man/groff_font.man b/man/groff_font.5.man
similarity index 100%
rename from man/groff_font.man
rename to man/groff_font.5.man
diff --git a/man/groff_out.man b/man/groff_out.5.man
similarity index 100%
rename from man/groff_out.man
rename to man/groff_out.5.man
diff --git a/man/groff_tmac.man b/man/groff_tmac.5.man
similarity index 100%
rename from man/groff_tmac.man
rename to man/groff_tmac.5.man
diff --git a/man/man.am b/man/man.am
index 2428df1..d5b50b6 100644
--- a/man/man.am
+++ b/man/man.am
@@ -29,14 +29,14 @@ man7_MANS += \
   man/groff.n \
   man/roff.n
 EXTRA_DIST += \
-  man/groff_font.man \
-  man/groff_out.man \
-  man/groff_tmac.man \
-  man/ditroff.man \
-  man/groff_char.man \
-  man/groff_diff.man \
-  man/groff.man \
-  man/roff.man
+  man/groff_font.5.man \
+  man/groff_out.5.man \
+  man/groff_tmac.5.man \
+  man/ditroff.7.man \
+  man/groff_char.7.man \
+  man/groff_diff.7.man \
+  man/groff.7.man \
+  man/roff.7.man
 
 # Case of out-of-source build: we must create the 'man' directory.
 BUILT_SOURCES += man
diff --git a/man/roff.man b/man/roff.7.man
similarity index 100%
rename from man/roff.man
rename to man/roff.7.man
diff --git a/src/devices/grodvi/grodvi.man b/src/devices/grodvi/grodvi.1.man
similarity index 100%
rename from src/devices/grodvi/grodvi.man
rename to src/devices/grodvi/grodvi.1.man
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index e7e59cd..d1bfe48 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ grodvi_LDADD = \
   libgroff.a \
   lib/libgnu.a $(LIBM)
 man1_MANS += src/devices/grodvi/grodvi.n
-EXTRA_DIST += src/devices/grodvi/grodvi.man
+EXTRA_DIST += src/devices/grodvi/grodvi.1.man
 
 
 ########################################################################
diff --git a/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.1.man
similarity index 100%
rename from src/devices/grohtml/grohtml.man
rename to src/devices/grohtml/grohtml.1.man
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index 59d7d57..de00fea 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -33,7 +33,7 @@ post_grohtml_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a 
 man1_MANS += src/devices/grohtml/grohtml.n
-EXTRA_DIST += src/devices/grohtml/grohtml.man
+EXTRA_DIST += src/devices/grohtml/grohtml.1.man
 
 
 ########################################################################
diff --git a/src/devices/grolbp/grolbp.man b/src/devices/grolbp/grolbp.1.man
similarity index 100%
rename from src/devices/grolbp/grolbp.man
rename to src/devices/grolbp/grolbp.1.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index ac829c3..a81c48f 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -29,7 +29,7 @@ grolbp_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a
 man1_MANS += src/devices/grolbp/grolbp.n
-EXTRA_DIST += src/devices/grolbp/grolbp.man
+EXTRA_DIST += src/devices/grolbp/grolbp.1.man
 
 
 ########################################################################
diff --git a/src/devices/grolj4/grolj4.man b/src/devices/grolj4/grolj4.1.man
similarity index 100%
rename from src/devices/grolj4/grolj4.man
rename to src/devices/grolj4/grolj4.1.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 5bb4271..35acb7d 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ grolj4_LDADD = $(LIBM) \
 man1_MANS += src/devices/grolj4/grolj4.n
 man5_MANS += src/devices/grolj4/lj4_font.n
 EXTRA_DIST += \
-  src/devices/grolj4/grolj4.man \
-  src/devices/grolj4/lj4_font.man
+  src/devices/grolj4/grolj4.1.man \
+  src/devices/grolj4/lj4_font.5.man
 
 ########################################################################
 ### Emacs settings
diff --git a/src/devices/grolj4/lj4_font.man b/src/devices/grolj4/lj4_font.5.man
similarity index 100%
rename from src/devices/grolj4/lj4_font.man
rename to src/devices/grolj4/lj4_font.5.man
diff --git a/src/devices/gropdf/gropdf.man b/src/devices/gropdf/gropdf.1.man
similarity index 100%
rename from src/devices/gropdf/gropdf.man
rename to src/devices/gropdf/gropdf.1.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 3e3d0e2..ece55f1 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -3,7 +3,7 @@
 #  Original Makefile.sub written by Deri James <address@hidden>.
 #  Automake migration by Bertrand Garrigues
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ EXTRA_DIST += \
   src/devices/gropdf/TODO \
   src/devices/gropdf/gropdf.pl \
   src/devices/gropdf/pdfmom.pl \
-  src/devices/gropdf/gropdf.man \
-  src/devices/gropdf/pdfmom.man
+  src/devices/gropdf/gropdf.1.man \
+  src/devices/gropdf/pdfmom.1.man
 
 man1_MANS += \
   src/devices/gropdf/gropdf.n \
diff --git a/src/devices/gropdf/pdfmom.man b/src/devices/gropdf/pdfmom.1.man
similarity index 100%
rename from src/devices/gropdf/pdfmom.man
rename to src/devices/gropdf/pdfmom.1.man
diff --git a/src/devices/grops/grops.man b/src/devices/grops/grops.1.man
similarity index 100%
rename from src/devices/grops/grops.man
rename to src/devices/grops/grops.1.man
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index dffaae2..41adf1c 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -29,7 +29,7 @@ grops_LDADD = $(LIBM) \
   lib/libgnu.a
 man1_MANS += src/devices/grops/grops.n
 EXTRA_DIST += \
-  src/devices/grops/grops.man \
+  src/devices/grops/grops.1.man \
   src/devices/grops/psfig.diff \
   src/devices/grops/TODO
 
diff --git a/src/devices/grotty/grotty.man b/src/devices/grotty/grotty.1.man
similarity index 100%
rename from src/devices/grotty/grotty.man
rename to src/devices/grotty/grotty.1.man
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index ad9cd2c..3dcc809 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,7 +26,7 @@ grotty_LDADD = $(LIBM) \
   lib/libgnu.a
 man1_MANS += src/devices/grotty/grotty.n
 EXTRA_DIST += \
-  src/devices/grotty/grotty.man \
+  src/devices/grotty/grotty.1.man \
   src/devices/grotty/TODO
 
 
diff --git a/src/devices/xditview/gxditview.man 
b/src/devices/xditview/gxditview.1.man
similarity index 100%
rename from src/devices/xditview/gxditview.man
rename to src/devices/xditview/gxditview.1.man
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 2c90097..f2b4261 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,7 +1,7 @@
-# Copyright (C) 2014-15
+# Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Last update: 13 Aug 2015
+# Last update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -77,7 +77,7 @@ EXTRA_DIST += \
   src/devices/xditview/gray8.bm \
   src/devices/xditview/xdit.bm \
   src/devices/xditview/xdit_mask.bm \
-  src/devices/xditview/gxditview.man
+  src/devices/xditview/gxditview.1.man
 
 # Custom installation of GXditview.ad and GXditview-color.ad
 install-data-local: install_xditview
diff --git a/src/preproc/eqn/eqn.man b/src/preproc/eqn/eqn.1.man
similarity index 100%
rename from src/preproc/eqn/eqn.man
rename to src/preproc/eqn/eqn.1.man
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index b6ad937..8eb836a 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -49,8 +49,8 @@ PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
 EXTRA_DIST += \
   src/preproc/eqn/TODO \
   src/preproc/eqn/neqn.sh \
-  src/preproc/eqn/eqn.man \
-  src/preproc/eqn/neqn.man
+  src/preproc/eqn/eqn.1.man \
+  src/preproc/eqn/neqn.1.man
 
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
 CLEANFILES += \
diff --git a/src/preproc/eqn/neqn.man b/src/preproc/eqn/neqn.1.man
similarity index 100%
rename from src/preproc/eqn/neqn.man
rename to src/preproc/eqn/neqn.1.man
diff --git a/src/preproc/grn/grn.man b/src/preproc/grn/grn.1.man
similarity index 100%
rename from src/preproc/grn/grn.man
rename to src/preproc/grn/grn.1.man
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index b385386..f64d551 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,7 +28,7 @@ grn_SOURCES = \
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 PREFIXMAN1 += src/preproc/grn/grn.n
-EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
 
 
 ########################################################################
diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.1.man
similarity index 100%
rename from src/preproc/pic/pic.man
rename to src/preproc/pic/pic.1.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index ced4780..bfdd76e 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -42,7 +42,7 @@ PREFIXMAN1 += src/preproc/pic/pic.n
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
 EXTRA_DIST += \
-  src/preproc/pic/pic.man \
+  src/preproc/pic/pic.1.man \
   src/preproc/pic/TODO
 CLEANFILES += \
   src/preproc/pic/pic.cpp \
diff --git a/src/preproc/preconv/preconv.man b/src/preproc/preconv/preconv.1.man
similarity index 100%
rename from src/preproc/preconv/preconv.man
rename to src/preproc/preconv/preconv.1.man
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index e5c119e..b4d7132 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@ bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
 man1_MANS += src/preproc/preconv/preconv.n
-EXTRA_DIST += src/preproc/preconv/preconv.man
+EXTRA_DIST += src/preproc/preconv/preconv.1.man
 
 
 ########################################################################
diff --git a/src/preproc/refer/refer.man b/src/preproc/refer/refer.1.man
similarity index 100%
rename from src/preproc/refer/refer.man
rename to src/preproc/refer/refer.1.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 6d82898..a879eba 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,7 +32,7 @@ refer_SOURCES =  \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
 PREFIXMAN1 += src/preproc/refer/refer.n
-EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
 CLEANFILES += \
   src/preproc/refer/label.cpp \
   src/preproc/refer/label.hpp \
diff --git a/src/preproc/soelim/soelim.man b/src/preproc/soelim/soelim.1.man
similarity index 100%
rename from src/preproc/soelim/soelim.man
rename to src/preproc/soelim/soelim.1.man
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index c5d9d87..ad4901e 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,7 +24,7 @@ soelim_SOURCES = src/preproc/soelim/soelim.cpp
 PREFIXMAN1 += src/preproc/soelim/soelim.n
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
-  src/preproc/soelim/soelim.man
+  src/preproc/soelim/soelim.1.man
 
 
 ########################################################################
diff --git a/src/preproc/tbl/tbl.man b/src/preproc/tbl/tbl.1.man
similarity index 100%
rename from src/preproc/tbl/tbl.man
rename to src/preproc/tbl/tbl.1.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index ce03299..b83ce77 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,7 +25,7 @@ tbl_SOURCES = \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
 PREFIXMAN1 += src/preproc/tbl/tbl.n
-EXTRA_DIST += src/preproc/tbl/tbl.man
+EXTRA_DIST += src/preproc/tbl/tbl.1.man
 
 
 ########################################################################
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.1.man
similarity index 100%
rename from src/roff/groff/groff.man
rename to src/roff/groff/groff.1.man
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 3c90715..6007e40 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -8,7 +8,7 @@
 #   Automake migration by 
 #   Bertrand Garrigues <address@hidden>
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ groff_SOURCES = \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
 man1_MANS += src/roff/groff/groff.n
-EXTRA_DIST += src/roff/groff/groff.man
+EXTRA_DIST += src/roff/groff/groff.1.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
   groff_opts_with_arg.txt
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.1.man
similarity index 100%
rename from src/roff/grog/grog.man
rename to src/roff/grog/grog.1.man
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index 2e7382f..1aa6b69 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -5,7 +5,7 @@
 # Copyright (C) 1993-2015
 #   Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of `grog' which is part of `groff'.
 #
@@ -31,7 +31,7 @@ grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
 man1_MANS += src/roff/grog/grog.n
 EXTRA_DIST += \
-  src/roff/grog/grog.man \
+  src/roff/grog/grog.1.man \
   src/roff/grog/grog.pl
 
 # Perl version works for all parts of `groff'.
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.1.man
similarity index 100%
rename from src/roff/nroff/nroff.man
rename to src/roff/nroff/nroff.1.man
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index b8d462f..526efe9 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@ prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
 PREFIXMAN1 += src/roff/nroff/nroff.n
 EXTRA_DIST += \
-  src/roff/nroff/nroff.man \
+  src/roff/nroff/nroff.1.man \
   src/roff/nroff/nroff.sh
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.1.man
similarity index 100%
rename from src/roff/troff/troff.man
rename to src/roff/troff/troff.1.man
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index f5e0695..9ddacbc 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@ prefixexecbin_PROGRAMS += troff
 PREFIXMAN1 += src/roff/troff/troff.n
 EXTRA_DIST += \
   src/roff/troff/column.cpp \
-  src/roff/troff/troff.man \
+  src/roff/troff/troff.1.man \
   src/roff/troff/TODO
 troff_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 troff_SOURCES = \
diff --git a/src/utils/addftinfo/addftinfo.man 
b/src/utils/addftinfo/addftinfo.1.man
similarity index 100%
rename from src/utils/addftinfo/addftinfo.man
rename to src/utils/addftinfo/addftinfo.1.man
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index 58e0ab6..c399de6 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 bin_PROGRAMS += addftinfo
 man1_MANS += src/utils/addftinfo/addftinfo.n
-EXTRA_DIST += src/utils/addftinfo/addftinfo.man
+EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
 addftinfo_LDADD = libgroff.a
 addftinfo_SOURCES = \
   src/utils/addftinfo/addftinfo.cpp \
diff --git a/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.1.man
similarity index 100%
rename from src/utils/afmtodit/afmtodit.man
rename to src/utils/afmtodit/afmtodit.1.man
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index bf9f3ec..f38870e 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2013-2015  Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,7 +28,7 @@ afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
 bin_SCRIPTS += afmtodit
 man1_MANS += src/utils/afmtodit/afmtodit.n
 EXTRA_DIST += \
-  src/utils/afmtodit/afmtodit.man \
+  src/utils/afmtodit/afmtodit.1.man \
   src/utils/afmtodit/afmtodit.pl \
   src/utils/afmtodit/afmtodit.tables \
   src/utils/afmtodit/make-afmtodit-tables
diff --git a/src/utils/hpftodit/hpftodit.man b/src/utils/hpftodit/hpftodit.1.man
similarity index 100%
rename from src/utils/hpftodit/hpftodit.man
rename to src/utils/hpftodit/hpftodit.1.man
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index dc9e18f..0c06262 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2014-2015  Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # `groff' is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 bin_PROGRAMS += hpftodit
 man1_MANS += src/utils/hpftodit/hpftodit.n
-EXTRA_DIST += src/utils/hpftodit/hpftodit.man
+EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
 hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
   src/utils/hpftodit/hpftodit.cpp \
diff --git a/src/utils/indxbib/indxbib.man b/src/utils/indxbib/indxbib.1.man
similarity index 100%
rename from src/utils/indxbib/indxbib.man
rename to src/utils/indxbib/indxbib.1.man
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 826d439..fc30587 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,7 +27,7 @@ src/utils/indxbib/indxbib.$(OBJEXT): defs.h
 indxbib_LDADD = libbib.a libgroff.a $(LIBM)
 PREFIXMAN1 += src/utils/indxbib/indxbib.n
 EXTRA_DIST += \
-  src/utils/indxbib/indxbib.man \
+  src/utils/indxbib/indxbib.1.man \
   src/utils/indxbib/eign
 
 install-data-local: install_indxbib
diff --git a/src/utils/lkbib/lkbib.man b/src/utils/lkbib/lkbib.1.man
similarity index 100%
rename from src/utils/lkbib/lkbib.man
rename to src/utils/lkbib/lkbib.1.man
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 0a6ae30..471025a 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS += lkbib
 man1_MANS += src/utils/lkbib/lkbib.n
-EXTRA_DIST += src/utils/lkbib/lkbib.man
+EXTRA_DIST += src/utils/lkbib/lkbib.1.man
 lkbib_LDADD = libbib.a libgroff.a $(LIBM)
 lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
 src/utils/lkbib/lkbib.$(OBJEXT): defs.h
diff --git a/src/utils/lookbib/lookbib.man b/src/utils/lookbib/lookbib.1.man
similarity index 100%
rename from src/utils/lookbib/lookbib.man
rename to src/utils/lookbib/lookbib.1.man
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index 5c19c20..b2e22de 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 prefixexecbin_PROGRAMS += lookbib
 PREFIXMAN1 += src/utils/lookbib/lookbib.n
-EXTRA_DIST += src/utils/lookbib/lookbib.man
+EXTRA_DIST += src/utils/lookbib/lookbib.1.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
 
diff --git a/src/utils/pfbtops/pfbtops.man b/src/utils/pfbtops/pfbtops.1.man
similarity index 100%
rename from src/utils/pfbtops/pfbtops.man
rename to src/utils/pfbtops/pfbtops.1.man
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index 4e8f520..1869c5b 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS += pfbtops
 man1_MANS += src/utils/pfbtops/pfbtops.n
-EXTRA_DIST += src/utils/pfbtops/pfbtops.man
+EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
 pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
 pfbtops_LDADD = libgroff.a $(LIBM)
 # We use the following trick to force the use of C++ compiler
diff --git a/src/utils/tfmtodit/tfmtodit.man b/src/utils/tfmtodit/tfmtodit.1.man
similarity index 100%
rename from src/utils/tfmtodit/tfmtodit.man
rename to src/utils/tfmtodit/tfmtodit.1.man
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 728f47c..6c6494a 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS += tfmtodit
 man1_MANS += src/utils/tfmtodit/tfmtodit.n
-EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
+EXTRA_DIST += src/utils/tfmtodit/tfmtodit.1.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
 
diff --git a/src/utils/xtotroff/xtotroff.man b/src/utils/xtotroff/xtotroff.1.man
similarity index 100%
rename from src/utils/xtotroff/xtotroff.man
rename to src/utils/xtotroff/xtotroff.1.man
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index 3fad985..8d4fce6 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-2015
 #      Free Software Foundation, Inc.
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,7 +27,7 @@ xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) 
$(X_PRE_LIBS) \
   -lXaw -lXt -lX11 $(X_EXTRA_LIBS) $(LIBM)
 xtotroff_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 endif
-EXTRA_DIST += src/utils/xtotroff/xtotroff.man
+EXTRA_DIST += src/utils/xtotroff/xtotroff.1.man
 
 
 ########################################################################
diff --git a/tmac/groff_man.man b/tmac/groff_man.7.man
similarity index 100%
rename from tmac/groff_man.man
rename to tmac/groff_man.7.man
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.7.man
similarity index 100%
rename from tmac/groff_mdoc.man
rename to tmac/groff_mdoc.7.man
diff --git a/tmac/groff_me.man b/tmac/groff_me.7.man
similarity index 100%
rename from tmac/groff_me.man
rename to tmac/groff_me.7.man
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.7.man
similarity index 100%
rename from tmac/groff_ms.man
rename to tmac/groff_ms.7.man
diff --git a/tmac/groff_trace.man b/tmac/groff_trace.7.man
similarity index 100%
rename from tmac/groff_trace.man
rename to tmac/groff_trace.7.man
diff --git a/tmac/groff_www.man b/tmac/groff_www.7.man
similarity index 100%
rename from tmac/groff_www.man
rename to tmac/groff_www.7.man
diff --git a/tmac/tmac.am b/tmac/tmac.am
index f26a24d..1bda6e4 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -3,7 +3,7 @@
 #      Written by James Clark (address@hidden)
 #      Automake migration by Bertrand Garrigues
 #
-# Latest update: 13 Aug 2015
+# Latest update: 22 Aug 2015
 #
 # This file is part of groff.
 #
@@ -121,12 +121,12 @@ MOSTLYCLEANFILES += $(TMACMDOCFILES) tmac/www.tmac 
$(TMACSTRIPFILES) \
 
 EXTRA_DIST += \
   tmac/fixmacros.sed \
-  tmac/groff_ms.man \
-  tmac/groff_man.man \
-  tmac/groff_me.man \
-  tmac/groff_mdoc.man \
-  tmac/groff_trace.man \
-  tmac/groff_www.man \
+  tmac/groff_ms.7.man \
+  tmac/groff_man.7.man \
+  tmac/groff_me.7.man \
+  tmac/groff_mdoc.7.man \
+  tmac/groff_trace.7.man \
+  tmac/groff_www.7.man \
   tmac/hyphenex.pl \
   tmac/LOCALIZATION \
   tmac/man.ultrix \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]