groff-commit
[Top][All Lists]
Advanced

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

[groff] 01/01: Revert previous commit, since it doesn't work correctly y


From: Werner LEMBERG
Subject: [groff] 01/01: Revert previous commit, since it doesn't work correctly yet.
Date: Sun, 09 Aug 2015 03:32:23 +0000

wl pushed a commit to branch master
in repository groff.

commit e89eadb042a8aacd3dc85768249eb8166a890d24
Author: Werner Lemberg <address@hidden>
Date:   Sun Aug 9 05:31:00 2015 +0200

    Revert previous commit, since it doesn't work correctly yet.
---
 ChangeLog                                          |    4 ++
 Makefile.am                                        |   18 +++++-----
 contrib/chem/chem.am                               |    6 ++--
 contrib/chem/{chem.1.man => chem.man}              |    0
 contrib/eqn2graph/eqn2graph.am                     |    6 ++--
 .../eqn2graph/{eqn2graph.1.man => eqn2graph.man}   |    0
 contrib/gdiffmk/ChangeLog                          |    4 --
 contrib/gdiffmk/gdiffmk.am                         |    4 +-
 contrib/gdiffmk/{gdiffmk.1.man => gdiffmk.man}     |    0
 contrib/glilypond/ChangeLog                        |    4 --
 contrib/glilypond/glilypond.am                     |    6 ++--
 .../glilypond/{glilypond.1.man => glilypond.man}   |    0
 contrib/gperl/ChangeLog                            |    4 --
 contrib/gperl/gperl.am                             |    6 ++--
 contrib/gperl/{gperl.1.man => gperl.man}           |    0
 contrib/gpinyin/ChangeLog                          |    4 --
 contrib/gpinyin/gpinyin.am                         |    6 ++--
 contrib/gpinyin/{gpinyin.1.man => gpinyin.man}     |    0
 contrib/grap2graph/grap2graph.am                   |    6 ++--
 .../{grap2graph.1.man => grap2graph.man}           |    0
 contrib/groff_filenames/groff_filenames.am         |    6 ++--
 .../{groff_filenames.7.man => groff_filenames.man} |    0
 contrib/groffer/ChangeLog                          |    4 --
 contrib/groffer/groffer.am                         |   38 ++++++++++----------
 contrib/groffer/{groffer.1.man => groffer.man}     |    0
 contrib/groffer/{roff2.1.man => roff2.man}         |    0
 contrib/hdtbl/ChangeLog                            |    4 --
 .../hdtbl/{groff_hdtbl.7.man => groff_hdtbl.man}   |    0
 contrib/hdtbl/hdtbl.am                             |    8 ++--
 contrib/mm/ChangeLog                               |    4 --
 contrib/mm/Makefile.sim                            |    8 ++--
 contrib/mm/{groff_mm.7.man => groff_mm.man}        |    0
 contrib/mm/{groff_mmse.7.man => groff_mmse.man}    |    0
 contrib/mm/mm.am                                   |   14 ++++----
 contrib/mm/{mmroff.1.man => mmroff.man}            |    0
 contrib/mom/ChangeLog                              |    4 --
 contrib/mom/{groff_mom.7.man => groff_mom.man}     |    0
 contrib/mom/mom.am                                 |    6 ++--
 contrib/pdfmark/ChangeLog                          |    4 --
 contrib/pdfmark/pdfmark.am                         |    6 ++--
 contrib/pdfmark/{pdfroff.1.man => pdfroff.man}     |    0
 contrib/pic2graph/pic2graph.am                     |    6 ++--
 .../pic2graph/{pic2graph.1.man => pic2graph.man}   |    0
 man/{ditroff.7.man => ditroff.man}                 |    0
 man/{groff.7.man => groff.man}                     |    0
 man/{groff_char.7.man => groff_char.man}           |    0
 man/{groff_diff.7.man => groff_diff.man}           |    0
 man/{groff_font.5.man => groff_font.man}           |    0
 man/{groff_out.5.man => groff_out.man}             |    0
 man/{groff_tmac.5.man => groff_tmac.man}           |    0
 man/man.am                                         |   34 +++++++++---------
 man/{roff.7.man => roff.man}                       |    0
 src/devices/grodvi/grodvi.am                       |    6 ++--
 src/devices/grodvi/{grodvi.1.man => grodvi.man}    |    0
 src/devices/grohtml/grohtml.am                     |    6 ++--
 src/devices/grohtml/{grohtml.1.man => grohtml.man} |    0
 src/devices/grolbp/grolbp.am                       |    6 ++--
 src/devices/grolbp/{grolbp.1.man => grolbp.man}    |    0
 src/devices/grolj4/grolj4.am                       |    8 ++--
 src/devices/grolj4/{grolj4.1.man => grolj4.man}    |    0
 .../grolj4/{lj4_font.5.man => lj4_font.man}        |    0
 src/devices/gropdf/gropdf.am                       |   10 +++---
 src/devices/gropdf/{gropdf.1.man => gropdf.man}    |    0
 src/devices/gropdf/{pdfmom.1.man => pdfmom.man}    |    0
 src/devices/grotty/grotty.am                       |    6 ++--
 src/devices/grotty/{grotty.1.man => grotty.man}    |    0
 .../xditview/{gxditview.1.man => gxditview.man}    |    0
 src/devices/xditview/xditview.am                   |    4 +-
 src/preproc/eqn/eqn.am                             |    8 ++--
 src/preproc/eqn/{eqn.1.man => eqn.man}             |    0
 src/preproc/eqn/{neqn.1.man => neqn.man}           |    0
 src/preproc/grn/grn.am                             |    6 ++--
 src/preproc/grn/{grn.1.man => grn.man}             |    0
 src/preproc/pic/pic.am                             |    6 ++--
 src/preproc/pic/{pic.1.man => pic.man}             |    0
 src/preproc/preconv/preconv.am                     |    6 ++--
 src/preproc/preconv/{preconv.1.man => preconv.man} |    0
 src/preproc/refer/refer.am                         |    6 ++--
 src/preproc/refer/{refer.1.man => refer.man}       |    0
 src/preproc/soelim/soelim.am                       |    6 ++--
 src/preproc/soelim/{soelim.1.man => soelim.man}    |    0
 src/preproc/tbl/tbl.am                             |    6 ++--
 src/preproc/tbl/{tbl.1.man => tbl.man}             |    0
 src/roff/groff/groff.am                            |    6 ++--
 src/roff/groff/{groff.1.man => groff.man}          |    0
 src/roff/grog/grog.am                              |    4 +-
 src/roff/grog/{grog.1.man => grog.man}             |    0
 src/roff/nroff/nroff.am                            |    6 ++--
 src/roff/nroff/{nroff.1.man => nroff.man}          |    0
 src/roff/troff/troff.am                            |    6 ++--
 src/roff/troff/{troff.1.man => troff.man}          |    0
 src/utils/addftinfo/addftinfo.am                   |    4 +-
 .../addftinfo/{addftinfo.1.man => addftinfo.man}   |    0
 src/utils/afmtodit/afmtodit.am                     |    6 ++--
 .../afmtodit/{afmtodit.1.man => afmtodit.man}      |    0
 src/utils/hpftodit/hpftodit.am                     |    6 ++--
 .../hpftodit/{hpftodit.1.man => hpftodit.man}      |    0
 src/utils/indxbib/indxbib.am                       |    6 ++--
 src/utils/indxbib/{indxbib.1.man => indxbib.man}   |    0
 src/utils/lkbib/lkbib.am                           |    6 ++--
 src/utils/lkbib/{lkbib.1.man => lkbib.man}         |    0
 src/utils/lookbib/lookbib.am                       |    4 +-
 src/utils/lookbib/{lookbib.1.man => lookbib.man}   |    0
 src/utils/pfbtops/pfbtops.am                       |    6 ++--
 src/utils/pfbtops/{pfbtops.1.man => pfbtops.man}   |    0
 src/utils/tfmtodit/tfmtodit.am                     |    6 ++--
 .../tfmtodit/{tfmtodit.1.man => tfmtodit.man}      |    0
 src/utils/xtotroff/xtotroff.am                     |    6 ++--
 .../xtotroff/{xtotroff.1.man => xtotroff.man}      |    0
 tmac/{groff_man.7.man => groff_man.man}            |    0
 tmac/{groff_mdoc.7.man => groff_mdoc.man}          |    0
 tmac/{groff_me.7.man => groff_me.man}              |    0
 tmac/{groff_ms.7.man => groff_ms.man}              |    0
 tmac/{groff_trace.7.man => groff_trace.man}        |    0
 tmac/{groff_www.7.man => groff_www.man}            |    0
 tmac/tmac.am                                       |   26 +++++++-------
 116 files changed, 190 insertions(+), 222 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9894b05..fae9ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-09  werner LEMBERG  <address@hidden>
+
+       Revert previous commit, since it doesn't work correctly yet.
+
 2015-08-07  Bernd Warken  <address@hidden>
 
        Add section name to all man-page names.
diff --git a/Makefile.am b/Makefile.am
index 6e9bfb7..17e10ad 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -708,34 +708,34 @@ if USEPROGRAMPREFIX
 generate_man_files: $(PREFIXMAN1)
 install-prefix-man:
        for f in $(PREFIXMAN1); do \
-         manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+         manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
          cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
        done
        for f in $(PREFIXMAN5); do \
-         manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+         manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
          cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
        done
        for f in $(PREFIXMAN7); do \
-         manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+         manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
          cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
        done
 uninstall-prefix-man:
        for f in $(PREFIXMAN1); do \
-         manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+         manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
          rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
        done
        for f in $(PREFIXMAN5); do \
-         manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+         manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
          rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
        done
        for f in $(PREFIXMAN7); do \
-         manfile_final_name=`basename $$f | sed 's/\.[0-9]\.n$$//'`; \
+         manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
          rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
        done
 else
 man1_MANS += $(PREFIXMAN1)
-man5_MANS += $(PREFIXMAN5)
-man7_MANS += $(PREFIXMAN7)
+man1_MANS += $(PREFIXMAN5)
+man1_MANS += $(PREFIXMAN7)
 install-prefix-man:
 uninstall-prefix-man:
 generate_man_files:
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index a3b6446..a8ca170 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -7,7 +7,7 @@
 # Written by Bernd Warken <address@hidden>.
 # Moved to automake by Bertrand Garrigues
 #
-# Last update: 7 Aug 2015
+# Last update: 6 Aug 2015
 #
 # This file is part of `chem' which is part of `groff'.
 #
@@ -56,14 +56,14 @@ nodist_chemexample122_DATA = 
contrib/chem/examples/122/README
 endif
 EXTRA_DIST += \
   contrib/chem/ChangeLog \
-  contrib/chem/chem.1.man \
+  contrib/chem/chem.man \
   contrib/chem/chem.pic \
   contrib/chem/chem.pl \
   contrib/chem/README.txt \
   contrib/chem/examples/README.txt \
   contrib/chem/examples/122/README.txt
 
-man1_MANS += contrib/chem/chem.1.n
+man1_MANS += contrib/chem/chem.n
 MOSTLYCLEANFILES += $(CHEM_GENEXAMPLES) $(nodist_chemexample122_DATA) \
   contrib/chem/README
 
diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.man
similarity index 100%
rename from contrib/chem/chem.1.man
rename to contrib/chem/chem.man
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index fc1bc0d..6ffa0ec 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2014
 #   Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,9 +23,9 @@
 
 eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
 bin_SCRIPTS += eqn2graph
-man1_MANS += contrib/eqn2graph/eqn2graph.1.n
+man1_MANS += contrib/eqn2graph/eqn2graph.n
 EXTRA_DIST += \
-  contrib/eqn2graph/eqn2graph.1.man \
+  contrib/eqn2graph/eqn2graph.man \
   contrib/eqn2graph/eqn2graph.sh
 
 eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/eqn2graph/eqn2graph.1.man b/contrib/eqn2graph/eqn2graph.man
similarity index 100%
rename from contrib/eqn2graph/eqn2graph.1.man
rename to contrib/eqn2graph/eqn2graph.man
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index da16587..d51c07a 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <address@hidden>
-
-       * gdiffmk.1.man, gdiffmk.am: Rename gdiffmk.man.
-
 2015-08-05  Bernd Warken  <address@hidden>
 
        * gdiffmk.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index df6ef67..6dbcf02 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -28,9 +28,9 @@
 gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
 bin_SCRIPTS += gdiffmk
 TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
-man1_MANS += contrib/gdiffmk/gdiffmk.1.n
+man1_MANS += contrib/gdiffmk/gdiffmk.n
 EXTRA_DIST += \
-  contrib/gdiffmk/gdiffmk.1.man \
+  contrib/gdiffmk/gdiffmk.man \
   contrib/gdiffmk/ChangeLog \
   contrib/gdiffmk/README \
   contrib/gdiffmk/gdiffmk.sh \
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.man
similarity index 100%
rename from contrib/gdiffmk/gdiffmk.1.man
rename to contrib/gdiffmk/gdiffmk.man
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index a1b6c28..1c0acfd 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <address@hidden>
 
-       glilypond.1.man, glilypond.am: Rename `glilypond.man'.
-
-2015-08-05  Bernd Warken  <address@hidden>
-
        * glilypond.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <address@hidden>
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index b417347..56018c1 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -28,7 +28,7 @@
 ########################################################################
 glilypond_srcdir = $(top_srcdir)/contrib/glilypond
 bin_SCRIPTS += glilypond
-man1_MANS += contrib/glilypond/glilypond.1.n
+man1_MANS += contrib/glilypond/glilypond.n
 
 # files going to lib directory `$(glilypond_dir)'
 # TODO glilypond_dir is subsitued by configure.ac, check if this could be 
removed
@@ -41,7 +41,7 @@ dist_glilypond_DATA = \
 EXTRA_DIST += \
   contrib/glilypond/ChangeLog \
   contrib/glilypond/ChangeLog.0x \
-  contrib/glilypond/glilypond.1.man \
+  contrib/glilypond/glilypond.man \
   contrib/glilypond/glilypond.pl \
   contrib/glilypond/README.txt \
   contrib/glilypond/examples/example.groff
diff --git a/contrib/glilypond/glilypond.1.man b/contrib/glilypond/glilypond.man
similarity index 100%
rename from contrib/glilypond/glilypond.1.man
rename to contrib/glilypond/glilypond.man
diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog
index 6ce945b..0d8b7c0 100644
--- a/contrib/gperl/ChangeLog
+++ b/contrib/gperl/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <address@hidden>
-
-       * gperl.1.man, gperl.am: Rename `gperl.man'.
-
 2015-08-05  Bernd Warken  <address@hidden>
 
        * gperl.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 34c6e98..79d0e92 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -6,7 +6,7 @@
 # Written by Bernd Warken <address@hidden>.
 # Automake migration by Bertrand Garrigues
 
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `gperl' which is part of `groff'.
 
@@ -27,10 +27,10 @@
 ########################################################################
 
 bin_SCRIPTS += gperl
-man1_MANS += contrib/gperl/gperl.1.n
+man1_MANS += contrib/gperl/gperl.n
 EXTRA_DIST += \
   contrib/gperl/ChangeLog \
-  contrib/gperl/gperl.1.man \
+  contrib/gperl/gperl.man \
   contrib/gperl/gperl.pl
 gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed
        $(RM) $@
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.man
similarity index 100%
rename from contrib/gperl/gperl.1.man
rename to contrib/gperl/gperl.man
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index c1352de..a3b2630 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <address@hidden>
 
-       * gpinyin.1.man, gpinyin.am: Rename `gpinyin.man'.
-
-2015-08-05  Bernd Warken  <address@hidden>
-
        * gpinyin.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <address@hidden>
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index f580743..09dcb59 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # This file is part of `gpinyin' which is part of `groff'.
 
@@ -31,10 +31,10 @@ gpinyin_srcdir = $(top_srcdir)/contrib/gpinyin
 bin_SCRIPTS += gpinyin
 gpinyindir = $(gpinyin_dir)
 dist_gpinyin_DATA = contrib/gpinyin/subs.pl
-man1_MANS += contrib/gpinyin/gpinyin.1.n
+man1_MANS += contrib/gpinyin/gpinyin.n
 EXTRA_DIST += \
   contrib/gpinyin/ChangeLog \
-  contrib/gpinyin/gpinyin.1.man \
+  contrib/gpinyin/gpinyin.man \
   contrib/gpinyin/gpinyin.pl
 
 gpinyin: contrib/gpinyin/gpinyin.pl
diff --git a/contrib/gpinyin/gpinyin.1.man b/contrib/gpinyin/gpinyin.man
similarity index 100%
rename from contrib/gpinyin/gpinyin.1.man
rename to contrib/gpinyin/gpinyin.man
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 6018f17..6c0b51b 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,10 +22,10 @@
 
 grap2graph_srcdir = $(top_srcdir)/contrib/grap2graph
 bin_SCRIPTS += grap2graph
-man1_MANS += contrib/grap2graph/grap2graph.1.n
+man1_MANS += contrib/grap2graph/grap2graph.n
 EXTRA_DIST += \
   $(grap2graph_srcdir)/grap2graph.sh \
-  $(grap2graph_srcdir)/grap2graph.1.man
+  $(grap2graph_srcdir)/grap2graph.man
 grap2graph: $(grap2graph_srcdir)/grap2graph.sh
        sed -e "s|address@hidden@]|$(g)|g" \
            -e "s|address@hidden@]|$(VERSION)|" \
diff --git a/contrib/grap2graph/grap2graph.1.man 
b/contrib/grap2graph/grap2graph.man
similarity index 100%
rename from contrib/grap2graph/grap2graph.1.man
rename to contrib/grap2graph/grap2graph.man
diff --git a/contrib/groff_filenames/groff_filenames.am 
b/contrib/groff_filenames/groff_filenames.am
index a18ac07..4c76eaf 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 
 # Written by Bernd Warken <address@hidden>.
 # Automake migration by Bertrand Garrigues
@@ -26,10 +26,10 @@
 
 ########################################################################
 
-man7_MANS += contrib/groff_filenames/groff_filenames.7.n
+man7_MANS += contrib/groff_filenames/groff_filenames.n
 EXTRA_DIST += \
   contrib/groff_filenames/ChangeLog \
-  contrib/groff_filenames/groff_filenames.7.man
+  contrib/groff_filenames/groff_filenames.man
 
 
 ########################################################################
diff --git a/contrib/groff_filenames/groff_filenames.7.man 
b/contrib/groff_filenames/groff_filenames.man
similarity index 100%
rename from contrib/groff_filenames/groff_filenames.7.man
rename to contrib/groff_filenames/groff_filenames.man
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index a79cc42..d9948a4 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <address@hidden>
-
-       Rename all man-pages by adding a section number.
-
 2015-08-05  Bernd Warken  <address@hidden>
 
        * groffer.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index 1793365..fa3f45b 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: 7 Aug 2015
+# Last update: 5 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.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
+  contrib/groffer/roff2dvi.man \
+  contrib/groffer/roff2html.man \
+  contrib/groffer/roff2pdf.man \
+  contrib/groffer/roff2ps.man \
+  contrib/groffer/roff2text.man \
+  contrib/groffer/roff2x.man
 
 GROFFER_PERL = \
   contrib/groffer/main_subs.pl \
@@ -54,9 +54,9 @@ GROFFER_PERL = \
   contrib/groffer/subs.pl
 
 GROFFER_REST = \
-  contrib/groffer/roff2.1.man \
+  contrib/groffer/roff2.man \
   contrib/groffer/version.sh \
-  contrib/groffer/groffer.1.man \
+  contrib/groffer/groffer.man \
   contrib/groffer/groffer.pl \
   contrib/groffer/roff2.pl
 
@@ -70,13 +70,13 @@ grofferdir = $(groffer_dir)
 bin_SCRIPTS += groffer $(ROFF2PROGS)
 groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh
 man1_MANS += \
-  contrib/groffer/groffer.1.n \
-  contrib/groffer/roff2dvi.1.n \
-  contrib/groffer/roff2html.1.n \
-  contrib/groffer/roff2pdf.1.n \
-  contrib/groffer/roff2ps.1.n \
-  contrib/groffer/roff2text.1.n \
-  contrib/groffer/roff2x.1.n
+  contrib/groffer/groffer.n \
+  contrib/groffer/roff2dvi.n \
+  contrib/groffer/roff2html.n \
+  contrib/groffer/roff2pdf.n \
+  contrib/groffer/roff2ps.n \
+  contrib/groffer/roff2text.n \
+  contrib/groffer/roff2x.n
 MOSTLYCLEANFILES += $(ROFF2MAN)
 
 $(ROFF2PROGS): $(groffer_srcdir)/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.1.man
+$(ROFF2MAN):  $(groffer_srcdir)/roff2.man
        @$(MKDIR_P) contrib/groffer
-       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 > $@;
+       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 > $@;
 
 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
        echo "Using perl version of groffer."; \
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.man
similarity index 100%
rename from contrib/groffer/groffer.1.man
rename to contrib/groffer/groffer.man
diff --git a/contrib/groffer/roff2.1.man b/contrib/groffer/roff2.man
similarity index 100%
rename from contrib/groffer/roff2.1.man
rename to contrib/groffer/roff2.man
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 36631de..77e10ac 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <address@hidden>
 
-       * groff_hdtbl.7.man,  hdtbl.am: Rename groff_hdtbl.man.
-
-2015-08-05  Bernd Warken  <address@hidden>
-
        * hdtbl.am: Add `Last update'.  Setup Emacs mode.
 
 2015-04-03  Werner LEMBERG  <address@hidden>
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.man
similarity index 100%
rename from contrib/hdtbl/groff_hdtbl.7.man
rename to contrib/hdtbl/groff_hdtbl.man
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 7ec3cc0..6a7ec92 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -22,7 +22,7 @@
 hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
 hdtbl_builddir = $(top_builddir)/contrib/hdtbl
 
-man7_MANS += contrib/hdtbl/groff_hdtbl.7.n
+man7_MANS += contrib/hdtbl/groff_hdtbl.n
 
 # Groff command used to generate .ps files
 HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
@@ -97,7 +97,7 @@ MOSTLYCLEANFILES += $(HDTBLGENFILES) 
$(HDTBLPROCESSEDEXAMPLEFILES) \
 EXTRA_DIST += \
   contrib/hdtbl/ChangeLog \
   contrib/hdtbl/TODO \
-  contrib/hdtbl/groff_hdtbl.1.man \
+  contrib/hdtbl/groff_hdtbl.man \
   contrib/hdtbl/hdtbl.tmac-u \
   contrib/hdtbl/hdmisc.tmac-u
 
@@ -122,7 +122,7 @@ $(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed
        sed -f $(top_srcdir)/tmac/strip.sed $(hdtbl_srcdir)/`basename 
address@hidden > $@;
 
 uninstall_groffdirs: uninstall-hdtbl-hook
-ninstall-hdtbl-hook:
+uninstall-hdtbl-hook:
        if test -d $(DESTDIR)$(hdtblexampledir); then \
          rmdir $(DESTDIR)$(hdtblexampledir); \
        fi
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index e533bbd..6223f33 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <address@hidden>
 
-       Rename all man-pages by adding a section number.
-
-2015-08-05  Bernd Warken  <address@hidden>
-
        * mm.am, Makefile.sim: Add `Last update'.  Setup Emacs mode.
 
 Thu Jul 16 11:52:03 2015  Carsten Kunze  <address@hidden>
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index c96f2c6..dc167e7 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,8 +1,8 @@
 # Copyright 1991-2015  Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
-# This file is part of hdtbl, which is part of groff.
+# This file is part of groff.
 #
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
@@ -46,11 +46,11 @@ mdate = 2002-05-11
 
 all:
 
-install: groff_mm.7.n groff_mmse.7.n
+install: groff_mm.n groff_mmse.n
        $(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
          INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
 
-uninstall: groff_mm.7.n groff_mmse.7.n
+uninstall: groff_mm.n groff_mmse.n
        $(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
          INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
 
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.man
similarity index 100%
rename from contrib/mm/groff_mm.7.man
rename to contrib/mm/groff_mm.man
diff --git a/contrib/mm/groff_mmse.7.man b/contrib/mm/groff_mmse.man
similarity index 100%
rename from contrib/mm/groff_mmse.7.man
rename to contrib/mm/groff_mmse.man
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 77f4cf9..318c0c5 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -1,7 +1,7 @@
 # Copyright 1991-2015
 #   Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,10 +26,10 @@ mm_builddir = $(top_builddir)/contrib/mm
 
 bin_SCRIPTS += mmroff
 
-man1_MANS += contrib/mm/mmroff.1.n
+man1_MANS += contrib/mm/mmroff.n
 man7_MANS += \
-  contrib/mm/groff_mm.7.n \
-  contrib/mm/groff_mmse.7.n
+  contrib/mm/groff_mm.n \
+  contrib/mm/groff_mmse.n
 
 # Files installed in $(tmacdir)/mm
 MMFILES = \
@@ -57,9 +57,9 @@ EXTRA_DIST += \
   contrib/mm/mm \
   contrib/mm/NOTES \
   contrib/mm/README \
-  contrib/mm/groff_mm.7.man \
-  contrib/mm/groff_mmse.7.man \
-  contrib/mm/mmroff.1.man \
+  contrib/mm/groff_mm.man \
+  contrib/mm/groff_mmse.man \
+  contrib/mm/mmroff.man \
   contrib/mm/mmroff.pl
 
 mmroff: $(mm_srcdir)/mmroff.pl
diff --git a/contrib/mm/mmroff.1.man b/contrib/mm/mmroff.man
similarity index 100%
rename from contrib/mm/mmroff.1.man
rename to contrib/mm/mmroff.man
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 5d328fb..10defb2 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,9 +1,5 @@
 2015-08-05  Bernd Warken  <address@hidden>
 
-       * groff_mom.7.man, mom.am: Rename `groff_mom.man'.
-
-2015-08-05  Bernd Warken  <address@hidden>
-
        * mom.am: Add `Last update'.  Setup Emacs mode.
 
 * Sun Jul 26 2015
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.man
similarity index 100%
rename from contrib/mom/groff_mom.7.man
rename to contrib/mom/groff_mom.man
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 19918a2..db94742 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,7 +32,7 @@ MOMPDFMOM = \
   PDFMOM_BIN_PATH="$(top_builddir)" \
   $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG)
 
-man7_MANS += contrib/mom/groff_mom.7.n
+man7_MANS += contrib/mom/groff_mom.n
 
 # Files installed in $(tmacdir).
 # MOMNORMALFILES are located in the source tree.
@@ -119,7 +119,7 @@ EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \
   contrib/mom/NEWS \
   contrib/mom/TODO \
   contrib/mom/copyright \
-  contrib/mom/groff_mom.7.man \
+  contrib/mom/groff_mom.man \
   contrib/mom/om.tmac-u
 
 MOSTLYCLEANFILES += \
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index a255803..6a7c894 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,7 +1,3 @@
-2015-08-07  Bernd Warken  <address@hidden>
-
-       * pdfroff.1.man, pdfmark.am: Rename `pdfroff.man'.
-
 2015-08-05  Bernd Warken  <address@hidden>
 
        * pdfmark.am: Add `Last update'.  Setup Emacs mode.
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 58e6226..6ebc6d9 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,7 +23,7 @@
 pdfmark_srcdir = $(top_srcdir)/contrib/pdfmark
 pdfmark_builddir = $(top_builddir)/contrib/pdfmark
 
-man1_MANS += contrib/pdfmark/pdfroff.1.n
+man1_MANS += contrib/pdfmark/pdfroff.n
 
 bin_SCRIPTS += pdfroff
 
@@ -52,7 +52,7 @@ EXTRA_DIST += \
   contrib/pdfmark/README \
   contrib/pdfmark/PROBLEMS \
   contrib/pdfmark/TODO \
-  contrib/pdfmark/pdfroff.1.man \
+  contrib/pdfmark/pdfroff.man \
   contrib/pdfmark/pdfroff.sh
 
 PDFMARK_PFLAG =-dpaper=$(PAGE) -P-p$(PAGE)
diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.man
similarity index 100%
rename from contrib/pdfmark/pdfroff.1.man
rename to contrib/pdfmark/pdfroff.man
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 37adc92..78b6635 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,11 +21,11 @@
 #
 
 pic2graph_srcdir = $(top_srcdir)/contrib/pic2graph
-man1_MANS += contrib/pic2graph/pic2graph.1.n
+man1_MANS += contrib/pic2graph/pic2graph.n
 bin_SCRIPTS += pic2graph
 EXTRA_DIST += \
   contrib/pic2graph/pic2graph.sh \
-  contrib/pic2graph/pic2graph.1.man
+  contrib/pic2graph/pic2graph.man
 pic2graph: $(pic2graph_srcdir)/pic2graph.sh
        sed -e "s|address@hidden@]|$(g)|g" \
            -e "s|address@hidden@]|$(VERSION)|" \
diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2graph.man
similarity index 100%
rename from contrib/pic2graph/pic2graph.1.man
rename to contrib/pic2graph/pic2graph.man
diff --git a/man/ditroff.7.man b/man/ditroff.man
similarity index 100%
rename from man/ditroff.7.man
rename to man/ditroff.man
diff --git a/man/groff.7.man b/man/groff.man
similarity index 100%
rename from man/groff.7.man
rename to man/groff.man
diff --git a/man/groff_char.7.man b/man/groff_char.man
similarity index 100%
rename from man/groff_char.7.man
rename to man/groff_char.man
diff --git a/man/groff_diff.7.man b/man/groff_diff.man
similarity index 100%
rename from man/groff_diff.7.man
rename to man/groff_diff.man
diff --git a/man/groff_font.5.man b/man/groff_font.man
similarity index 100%
rename from man/groff_font.5.man
rename to man/groff_font.man
diff --git a/man/groff_out.5.man b/man/groff_out.man
similarity index 100%
rename from man/groff_out.5.man
rename to man/groff_out.man
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.man
similarity index 100%
rename from man/groff_tmac.5.man
rename to man/groff_tmac.man
diff --git a/man/man.am b/man/man.am
index 55560e5..9d6ff2d 100644
--- a/man/man.am
+++ b/man/man.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #   Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of `groff'
 #
@@ -19,24 +19,24 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 man5_MANS += \
-  man/groff_font.5.n \
-  man/groff_out.5.n \
-  man/groff_tmac.5.n
+  man/groff_font.n \
+  man/groff_out.n \
+  man/groff_tmac.n
 man7_MANS += \
-  man/ditroff.7.n \
-  man/groff_char.7.n \
-  man/groff_diff.7.n \
-  man/groff.7.n \
-  man/roff.7.n
+  man/ditroff.n \
+  man/groff_char.n \
+  man/groff_diff.n \
+  man/groff.n \
+  man/roff.n
 EXTRA_DIST += \
-  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
+  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
 
 # Case of out-of-source build: we must create the 'man' directory.
 BUILT_SOURCES += man
diff --git a/man/roff.7.man b/man/roff.man
similarity index 100%
rename from man/roff.7.man
rename to man/roff.man
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index eaf3e15..53af681 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,8 +24,8 @@ grodvi_LDADD = \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a $(LIBM)
-man1_MANS += src/devices/grodvi/grodvi.1.n
-EXTRA_DIST += src/devices/grodvi/grodvi.1.man
+man1_MANS += src/devices/grodvi/grodvi.n
+EXTRA_DIST += src/devices/grodvi/grodvi.man
 
 
 ########################################################################
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.man
similarity index 100%
rename from src/devices/grodvi/grodvi.1.man
rename to src/devices/grodvi/grodvi.man
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index e2d864a..8d33f8f 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -32,8 +32,8 @@ post_grohtml_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a 
-man1_MANS += src/devices/grohtml/grohtml.1.n
-EXTRA_DIST += src/devices/grohtml/grohtml.1.man
+man1_MANS += src/devices/grohtml/grohtml.n
+EXTRA_DIST += src/devices/grohtml/grohtml.man
 
 
 ########################################################################
diff --git a/src/devices/grohtml/grohtml.1.man b/src/devices/grohtml/grohtml.man
similarity index 100%
rename from src/devices/grohtml/grohtml.1.man
rename to src/devices/grohtml/grohtml.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index 2a7c225..a7f1ffe 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -28,8 +28,8 @@ grolbp_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolbp/grolbp.1.n
-EXTRA_DIST += src/devices/grolbp/grolbp.1.man
+man1_MANS += src/devices/grolbp/grolbp.n
+EXTRA_DIST += src/devices/grolbp/grolbp.man
 
 
 ########################################################################
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.man
similarity index 100%
rename from src/devices/grolbp/grolbp.1.man
rename to src/devices/grolbp/grolbp.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index e941f1f..7d4b5bf 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -24,11 +24,11 @@ grolj4_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grolj4/grolj4.1.n
-man5_MANS += src/devices/grolj4/lj4_font.5.n
+man1_MANS += src/devices/grolj4/grolj4.n
+man5_MANS += src/devices/grolj4/lj4_font.n
 EXTRA_DIST += \
-  src/devices/grolj4/grolj4.1.man \
-  src/devices/grolj4/lj4_font.5.man
+  src/devices/grolj4/grolj4.man \
+  src/devices/grolj4/lj4_font.man
 
 ########################################################################
 ### Emacs settings
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.man
similarity index 100%
rename from src/devices/grolj4/grolj4.1.man
rename to src/devices/grolj4/grolj4.man
diff --git a/src/devices/grolj4/lj4_font.5.man b/src/devices/grolj4/lj4_font.man
similarity index 100%
rename from src/devices/grolj4/lj4_font.5.man
rename to src/devices/grolj4/lj4_font.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 86aba15..4d41d96 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: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,12 +27,12 @@ EXTRA_DIST += \
   src/devices/gropdf/TODO \
   src/devices/gropdf/gropdf.pl \
   src/devices/gropdf/pdfmom.pl \
-  src/devices/gropdf/gropdf.1.man \
-  src/devices/gropdf/pdfmom.1.man
+  src/devices/gropdf/gropdf.man \
+  src/devices/gropdf/pdfmom.man
 
 man1_MANS += \
-  src/devices/gropdf/gropdf.1.n \
-  src/devices/gropdf/pdfmom.1.n
+  src/devices/gropdf/gropdf.n \
+  src/devices/gropdf/pdfmom.n
 
 gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
        $(RM) $@
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.man
similarity index 100%
rename from src/devices/gropdf/gropdf.1.man
rename to src/devices/gropdf/gropdf.man
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.man
similarity index 100%
rename from src/devices/gropdf/pdfmom.1.man
rename to src/devices/gropdf/pdfmom.man
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index 3f52fbd..d200e5d 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,9 +24,9 @@ grotty_LDADD = $(LIBM) \
   libdriver.a \
   libgroff.a \
   lib/libgnu.a
-man1_MANS += src/devices/grotty/grotty.1.n
+man1_MANS += src/devices/grotty/grotty.n
 EXTRA_DIST += \
-  src/devices/grotty/grotty.1.man \
+  src/devices/grotty/grotty.man \
   src/devices/grotty/TODO
 
 
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.man
similarity index 100%
rename from src/devices/grotty/grotty.1.man
rename to src/devices/grotty/grotty.man
diff --git a/src/devices/xditview/gxditview.1.man 
b/src/devices/xditview/gxditview.man
similarity index 100%
rename from src/devices/xditview/gxditview.1.man
rename to src/devices/xditview/gxditview.man
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 52009ee..d4c65a0 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Last update: 7 Aug 2015
+# Last update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -46,7 +46,7 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
 nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
 CLEANFILES += $(XDITVIEW_GENHDRS)
 
-man1_MANS += src/devices/xditview/gxditview.1.n
+man1_MANS += src/devices/xditview/gxditview.n
 
 # Because we defined gxditview_CPPFLAGS, automake renames all the xditview's 
 # objects, adding an "gxditview-" prefix. 
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 310bb45..9184e33 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -45,12 +45,12 @@ eqn_SOURCES = \
   src/preproc/eqn/pbox.h \
   src/preproc/eqn/eqn.h
 
-PREFIXMAN1 += src/preproc/eqn/eqn.1.n src/preproc/eqn/neqn.1.n
+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.1.man \
-  src/preproc/eqn/neqn.1.man
+  src/preproc/eqn/eqn.man \
+  src/preproc/eqn/neqn.man
 
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
 CLEANFILES += \
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.man
similarity index 100%
rename from src/preproc/eqn/eqn.1.man
rename to src/preproc/eqn/eqn.man
diff --git a/src/preproc/eqn/neqn.1.man b/src/preproc/eqn/neqn.man
similarity index 100%
rename from src/preproc/eqn/neqn.1.man
rename to src/preproc/eqn/neqn.man
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 96ee4a1..9691bff 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -27,8 +27,8 @@ grn_SOURCES = \
   src/preproc/grn/gprint.h
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
-PREFIXMAN1 += src/preproc/grn/grn.1.n
-EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
+PREFIXMAN1 += src/preproc/grn/grn.n
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
 
 
 ########################################################################
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.man
similarity index 100%
rename from src/preproc/grn/grn.1.man
rename to src/preproc/grn/grn.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index cae82db..18ee0e5 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -38,11 +38,11 @@ pic_SOURCES = \
 pic_CPPFLAGS = $(AM_CPPFLAGS) \
   -I $(top_srcdir)/src/preproc/pic \
   -I $(top_builddir)/src/preproc/pic
-PREFIXMAN1 += src/preproc/pic/pic.1.n
+PREFIXMAN1 += src/preproc/pic/pic.n
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
 EXTRA_DIST += \
-  src/preproc/pic/pic.1.man \
+  src/preproc/pic/pic.man \
   src/preproc/pic/TODO
 CLEANFILES += \
   src/preproc/pic/pic.cpp \
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.man
similarity index 100%
rename from src/preproc/pic/pic.1.man
rename to src/preproc/pic/pic.man
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index 66a792f..e4130e1 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,8 +21,8 @@
 bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
-man1_MANS += src/preproc/preconv/preconv.1.n
-EXTRA_DIST += src/preproc/preconv/preconv.1.man
+man1_MANS += src/preproc/preconv/preconv.n
+EXTRA_DIST += src/preproc/preconv/preconv.man
 
 
 ########################################################################
diff --git a/src/preproc/preconv/preconv.1.man b/src/preproc/preconv/preconv.man
similarity index 100%
rename from src/preproc/preconv/preconv.1.man
rename to src/preproc/preconv/preconv.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 94800ac..33b4ca9 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -31,8 +31,8 @@ refer_SOURCES =  \
   src/preproc/refer/ref.h \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
-PREFIXMAN1 += src/preproc/refer/refer.1.n
-EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
+PREFIXMAN1 += src/preproc/refer/refer.n
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
 CLEANFILES += \
   src/preproc/refer/label.cpp \
   src/preproc/refer/label.hpp \
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.man
similarity index 100%
rename from src/preproc/refer/refer.1.man
rename to src/preproc/refer/refer.man
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index d7b10c9..debc1ae 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -21,10 +21,10 @@
 prefixexecbin_PROGRAMS += soelim
 soelim_LDADD = libgroff.a $(LIBM)
 soelim_SOURCES = src/preproc/soelim/soelim.cpp
-PREFIXMAN1 += src/preproc/soelim/soelim.1.n
+PREFIXMAN1 += src/preproc/soelim/soelim.n
 EXTRA_DIST += \
   src/preproc/soelim/TODO \
-  src/preproc/soelim/soelim.1.man
+  src/preproc/soelim/soelim.man
 
 
 ########################################################################
diff --git a/src/preproc/soelim/soelim.1.man b/src/preproc/soelim/soelim.man
similarity index 100%
rename from src/preproc/soelim/soelim.1.man
rename to src/preproc/soelim/soelim.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index dbb795f..5b41f3c 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -24,8 +24,8 @@ tbl_SOURCES = \
   src/preproc/tbl/main.cpp \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
-PREFIXMAN1 += src/preproc/tbl/tbl.1.n
-EXTRA_DIST += src/preproc/tbl/tbl.1.man
+PREFIXMAN1 += src/preproc/tbl/tbl.n
+EXTRA_DIST += src/preproc/tbl/tbl.man
 
 
 ########################################################################
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.man
similarity index 100%
rename from src/preproc/tbl/tbl.1.man
rename to src/preproc/tbl/tbl.man
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index a2ba730..169c9d7 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: 7 Aug 2015
+# Latest update: 5 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
@@ -35,8 +35,8 @@ groff_SOURCES = \
   src/roff/groff/pipeline.c \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
-man1_MANS += src/roff/groff/groff.1.n
-EXTRA_DIST += src/roff/groff/groff.1.man
+man1_MANS += src/roff/groff/groff.n
+EXTRA_DIST += src/roff/groff/groff.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
   groff_opts_with_arg.txt
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.man
similarity index 100%
rename from src/roff/groff/groff.1.man
rename to src/roff/groff/groff.man
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index ab35dab..b1dcb35 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -29,9 +29,9 @@ GROG = src/roff/grog/subs.pl
 # grog_dir is defined by a m4 macro
 grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
-man1_MANS += src/roff/grog/grog.1.n
+man1_MANS += src/roff/grog/grog.n
 EXTRA_DIST += \
-  src/roff/grog/grog.1.man \
+  src/roff/grog/grog.man \
   src/roff/grog/grog.pl
 
 # Perl version works for all parts of `groff'.
diff --git a/src/roff/grog/grog.1.man b/src/roff/grog/grog.man
similarity index 100%
rename from src/roff/grog/grog.1.man
rename to src/roff/grog/grog.man
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 5ea1354..f0ad935 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,9 +20,9 @@
 
 prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
-PREFIXMAN1 += src/roff/nroff/nroff.1.n
+PREFIXMAN1 += src/roff/nroff/nroff.n
 EXTRA_DIST += \
-  src/roff/nroff/nroff.1.man \
+  src/roff/nroff/nroff.man \
   src/roff/nroff/nroff.sh
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.man
similarity index 100%
rename from src/roff/nroff/nroff.1.man
rename to src/roff/nroff/nroff.man
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 699438b..50091a2 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -1,7 +1,7 @@
 # Copyright (C) 2014-15
 #      Free Software Foundation, Inc.
 #
-# Latest update: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,10 +19,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += troff
-PREFIXMAN1 += src/roff/troff/troff.1.n
+PREFIXMAN1 += src/roff/troff/troff.n
 EXTRA_DIST += \
   src/roff/troff/column.cpp \
-  src/roff/troff/troff.1.man \
+  src/roff/troff/troff.man \
   src/roff/troff/TODO
 troff_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 troff_SOURCES = \
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.man
similarity index 100%
rename from src/roff/troff/troff.1.man
rename to src/roff/troff/troff.man
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index 40fef40..b029685 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -23,8 +23,8 @@
 ########################################################################
 
 bin_PROGRAMS += addftinfo
-man1_MANS += src/utils/addftinfo/addftinfo.1.n
-EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
+man1_MANS += src/utils/addftinfo/addftinfo.n
+EXTRA_DIST += src/utils/addftinfo/addftinfo.man
 addftinfo_LDADD = libgroff.a
 addftinfo_SOURCES = \
   src/utils/addftinfo/addftinfo.cpp \
diff --git a/src/utils/addftinfo/addftinfo.1.man 
b/src/utils/addftinfo/addftinfo.man
similarity index 100%
rename from src/utils/addftinfo/addftinfo.1.man
rename to src/utils/addftinfo/addftinfo.man
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index e57a928..707880f 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -26,9 +26,9 @@
 afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
 
 bin_SCRIPTS += afmtodit
-man1_MANS += src/utils/afmtodit/afmtodit.1.n
+man1_MANS += src/utils/afmtodit/afmtodit.n
 EXTRA_DIST += \
-  src/utils/afmtodit/afmtodit.1.man \
+  src/utils/afmtodit/afmtodit.man \
   src/utils/afmtodit/afmtodit.pl \
   src/utils/afmtodit/afmtodit.tables \
   src/utils/afmtodit/make-afmtodit-tables
diff --git a/src/utils/afmtodit/afmtodit.1.man b/src/utils/afmtodit/afmtodit.man
similarity index 100%
rename from src/utils/afmtodit/afmtodit.1.man
rename to src/utils/afmtodit/afmtodit.man
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index 4172919..cb9d27b 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: 7 Aug 2015
+# Latest update: 5 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
@@ -23,8 +23,8 @@
 ########################################################################
 
 bin_PROGRAMS += hpftodit
-man1_MANS += src/utils/hpftodit/hpftodit.1.n
-EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
+man1_MANS += src/utils/hpftodit/hpftodit.n
+EXTRA_DIST += src/utils/hpftodit/hpftodit.man
 hpftodit_LDADD = libgroff.a $(LIBM)
 hpftodit_SOURCES = \
   src/utils/hpftodit/hpftodit.cpp \
diff --git a/src/utils/hpftodit/hpftodit.1.man b/src/utils/hpftodit/hpftodit.man
similarity index 100%
rename from src/utils/hpftodit/hpftodit.1.man
rename to src/utils/hpftodit/hpftodit.man
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 8c666f8..c2651f4 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -25,9 +25,9 @@ indxbib_SOURCES = \
   src/utils/indxbib/signal.c
 src/utils/indxbib/indxbib.$(OBJEXT): defs.h
 indxbib_LDADD = libbib.a libgroff.a $(LIBM)
-PREFIXMAN1 += src/utils/indxbib/indxbib.1.n
+PREFIXMAN1 += src/utils/indxbib/indxbib.n
 EXTRA_DIST += \
-  src/utils/indxbib/indxbib.1.man \
+  src/utils/indxbib/indxbib.man \
   src/utils/indxbib/eign
 
 install-data-local: install_indxbib
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.man
similarity index 100%
rename from src/utils/indxbib/indxbib.1.man
rename to src/utils/indxbib/indxbib.man
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 5049352..3b15076 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += lkbib
-man1_MANS += src/utils/lkbib/lkbib.1.n
-EXTRA_DIST += src/utils/lkbib/lkbib.1.man
+man1_MANS += src/utils/lkbib/lkbib.n
+EXTRA_DIST += src/utils/lkbib/lkbib.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/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.man
similarity index 100%
rename from src/utils/lkbib/lkbib.1.man
rename to src/utils/lkbib/lkbib.man
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index f0db884..7fda71a 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += lookbib
-PREFIXMAN1 += src/utils/lookbib/lookbib.1.n
-EXTRA_DIST += src/utils/lookbib/lookbib.1.man
+PREFIXMAN1 += src/utils/lookbib/lookbib.n
+EXTRA_DIST += src/utils/lookbib/lookbib.man
 lookbib_LDADD = libbib.a libgroff.a $(LIBM)
 lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
 
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.man
similarity index 100%
rename from src/utils/lookbib/lookbib.1.man
rename to src/utils/lookbib/lookbib.man
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index 8275968..bc99cfd 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += pfbtops
-man1_MANS += src/utils/pfbtops/pfbtops.1.n
-EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
+man1_MANS += src/utils/pfbtops/pfbtops.n
+EXTRA_DIST += src/utils/pfbtops/pfbtops.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/pfbtops/pfbtops.1.man b/src/utils/pfbtops/pfbtops.man
similarity index 100%
rename from src/utils/pfbtops/pfbtops.1.man
rename to src/utils/pfbtops/pfbtops.man
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index fa92c3c..00ee06f 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -19,8 +19,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS += tfmtodit
-man1_MANS += src/utils/tfmtodit/tfmtodit.1.n
-EXTRA_DIST += src/utils/tfmtodit/tfmtodit.1.man
+man1_MANS += src/utils/tfmtodit/tfmtodit.n
+EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
 tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
 tfmtodit_LDADD = libgroff.a $(LIBM)
 
diff --git a/src/utils/tfmtodit/tfmtodit.1.man b/src/utils/tfmtodit/tfmtodit.man
similarity index 100%
rename from src/utils/tfmtodit/tfmtodit.1.man
rename to src/utils/tfmtodit/tfmtodit.man
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index 5960364..fc43ba0 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -20,14 +20,14 @@
 
 if !WITHOUT_X11
 bin_PROGRAMS += xtotroff
-man1_MANS += src/utils/xtotroff/xtotroff.1.n
+man1_MANS += src/utils/xtotroff/xtotroff.n
 xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c
 XLIBS=$(LIBXUTIL) $(LIBGROFF)
 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.1.man
+EXTRA_DIST += src/utils/xtotroff/xtotroff.man
 
 
 ########################################################################
diff --git a/src/utils/xtotroff/xtotroff.1.man b/src/utils/xtotroff/xtotroff.man
similarity index 100%
rename from src/utils/xtotroff/xtotroff.1.man
rename to src/utils/xtotroff/xtotroff.man
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.man
similarity index 100%
rename from tmac/groff_man.7.man
rename to tmac/groff_man.man
diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.man
similarity index 100%
rename from tmac/groff_mdoc.7.man
rename to tmac/groff_mdoc.man
diff --git a/tmac/groff_me.7.man b/tmac/groff_me.man
similarity index 100%
rename from tmac/groff_me.7.man
rename to tmac/groff_me.man
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.man
similarity index 100%
rename from tmac/groff_ms.7.man
rename to tmac/groff_ms.man
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.man
similarity index 100%
rename from tmac/groff_trace.7.man
rename to tmac/groff_trace.man
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.man
similarity index 100%
rename from tmac/groff_www.7.man
rename to tmac/groff_www.man
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 410ffb8..c387892 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: 7 Aug 2015
+# Latest update: 5 Aug 2015
 #
 # This file is part of groff.
 #
@@ -23,12 +23,12 @@ tmac_srcdir = $(top_srcdir)/tmac
 tmac_builddir = $(top_builddir)/tmac
 
 man7_MANS += \
-  tmac/groff_ms.7.n \
-  tmac/groff_man.7.n \
-  tmac/groff_me.7.n \
-  tmac/groff_mdoc.7.n \
-  tmac/groff_trace.7.n \
-  tmac/groff_www.7.n
+  tmac/groff_ms.n \
+  tmac/groff_man.n \
+  tmac/groff_me.n \
+  tmac/groff_mdoc.n \
+  tmac/groff_trace.n \
+  tmac/groff_www.n
 
 TMACNORMALFILES = \
   tmac/man.tmac \
@@ -121,12 +121,12 @@ MOSTLYCLEANFILES += $(TMACMDOCFILES) tmac/www.tmac 
$(TMACSTRIPFILES) \
 
 EXTRA_DIST += \
   tmac/fixmacros.sed \
-  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/groff_ms.man \
+  tmac/groff_man.man \
+  tmac/groff_me.man \
+  tmac/groff_mdoc.man \
+  tmac/groff_trace.man \
+  tmac/groff_www.man \
   tmac/hyphenex.pl \
   tmac/LOCALIZATION \
   tmac/man.ultrix \



reply via email to

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