[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Groff] all man-pages with section number
|
From: |
Bertrand Garrigues |
|
Subject: |
Re: [Groff] all man-pages with section number |
|
Date: |
Mon, 24 Aug 2015 23:43:00 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Hi Bernd,
On Sat, Aug 22 2015 at 01:50:34 PM, "Bernd Warken" <address@hidden> wrote:
> I just published the renaming of man-pages including the section number, e.g.
>
> groffer.man -> groffer.1.man
>
> groffer.1.man is then transferred into groffer.n, which is installed as
> groffer.1.
> Make install, uninstall, clean, and distclean work as they should.
>
>
> Please test.
It works fine for me. However we now have 3 indentical rules to
generated man files in Makefile.am. As Keith suggested, we could
simplify by writing a single rule (.[157].man -> .[157]) and get rid of
the .n files by building directly .1, .5 and .7 files instead.
Here is a patch that makes this enhancement, make install/uninstall,
distcheck works for me. I've also tested the case of an existing troff
installed on the system (where some man files have a 'g' prefix). Could
you please test? If it's OK on your side I'll commit this change.
Thanks,
Regards,
diff --git a/Makefile.am b/Makefile.am
index 32303c0..2697115 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -708,29 +708,23 @@ if USEPROGRAMPREFIX
generate_man_files: $(PREFIXMAN1)
install-prefix-man:
for f in $(PREFIXMAN1); do \
- manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
- cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
+ cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$f`; \
done
for f in $(PREFIXMAN5); do \
- manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
- cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
+ cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)`basename $$f`; \
done
for f in $(PREFIXMAN7); do \
- manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
- cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
+ cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)`basename $$f`; \
done
uninstall-prefix-man:
for f in $(PREFIXMAN1); do \
- manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \
- rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \
+ rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$f`; \
done
for f in $(PREFIXMAN5); do \
- manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \
- rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \
+ rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)`basename $$f`; \
done
for f in $(PREFIXMAN7); do \
- manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \
- rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \
+ rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)`basename $$f`; \
done
else
man1_MANS += $(PREFIXMAN1)
@@ -829,7 +823,7 @@ EXTRA_DIST += \
ChangeLog.116 \
ChangeLog.117 \
ChangeLog.118 \
- ChangeLog.119 \
+ ChangeLog.119 \
ChangeLog.120 \
ChangeLog.121 \
FDL \
@@ -854,92 +848,11 @@ MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS)
$(bin_SCRIPTS) \
$(PREFIXMAN1) $(PREFIXMAN5) $(PREFIXMAN7) \
test-groff
-# Rule to build .man files. The brackets around the @ are used to prevent the
-# substitution of the variable by automake.
-
-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:
+# Suffixe rule to build .1, .5 and .7 files from .1.man, .5.man and
+# .7.man files. The brackets around the @ are used to prevent the
+# substitution of the variable by automake.
+SUFFIXES += .man
+.man:
@echo Making $@ from $<
rm -f $@
$(MKDIR_P) `dirname address@hidden
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index 671d2b4..b6f6651 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -63,7 +63,7 @@ EXTRA_DIST += \
contrib/chem/examples/README.txt \
contrib/chem/examples/122/README.txt
-man1_MANS += contrib/chem/chem.n
+man1_MANS += contrib/chem/chem.1
MOSTLYCLEANFILES += $(CHEM_GENEXAMPLES) $(nodist_chemexample122_DATA) \
contrib/chem/README
diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph.am
index 89bd76e..a631f64 100644
--- a/contrib/eqn2graph/eqn2graph.am
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -23,7 +23,7 @@
eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
bin_SCRIPTS += eqn2graph
-man1_MANS += contrib/eqn2graph/eqn2graph.n
+man1_MANS += contrib/eqn2graph/eqn2graph.1
EXTRA_DIST += \
contrib/eqn2graph/eqn2graph.1.man \
contrib/eqn2graph/eqn2graph.sh
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index e6bf07e..6a5a607 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -28,7 +28,7 @@
gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
bin_SCRIPTS += gdiffmk
TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
-man1_MANS += contrib/gdiffmk/gdiffmk.n
+man1_MANS += contrib/gdiffmk/gdiffmk.1
EXTRA_DIST += \
contrib/gdiffmk/gdiffmk.1.man \
contrib/gdiffmk/ChangeLog \
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index a831a46..77ad477 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -28,7 +28,7 @@
########################################################################
glilypond_srcdir = $(top_srcdir)/contrib/glilypond
bin_SCRIPTS += glilypond
-man1_MANS += contrib/glilypond/glilypond.n
+man1_MANS += contrib/glilypond/glilypond.1
# files going to lib directory `$(glilypond_dir)'
# TODO glilypond_dir is subsitued by configure.ac, check if this could be
removed
diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am
index 6add9f9..9520a6b 100644
--- a/contrib/gperl/gperl.am
+++ b/contrib/gperl/gperl.am
@@ -27,7 +27,7 @@
########################################################################
bin_SCRIPTS += gperl
-man1_MANS += contrib/gperl/gperl.n
+man1_MANS += contrib/gperl/gperl.1
EXTRA_DIST += \
contrib/gperl/ChangeLog \
contrib/gperl/gperl.1.man \
diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am
index 44596e8..bba0e6d 100644
--- a/contrib/gpinyin/gpinyin.am
+++ b/contrib/gpinyin/gpinyin.am
@@ -31,7 +31,7 @@ gpinyin_srcdir = $(top_srcdir)/contrib/gpinyin
bin_SCRIPTS += gpinyin
gpinyindir = $(gpinyin_dir)
dist_gpinyin_DATA = contrib/gpinyin/subs.pl
-man1_MANS += contrib/gpinyin/gpinyin.n
+man1_MANS += contrib/gpinyin/gpinyin.1
EXTRA_DIST += \
contrib/gpinyin/ChangeLog \
contrib/gpinyin/gpinyin.1.man \
diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2graph.am
index 9a25dab..559e4da 100644
--- a/contrib/grap2graph/grap2graph.am
+++ b/contrib/grap2graph/grap2graph.am
@@ -22,7 +22,7 @@
grap2graph_srcdir = $(top_srcdir)/contrib/grap2graph
bin_SCRIPTS += grap2graph
-man1_MANS += contrib/grap2graph/grap2graph.n
+man1_MANS += contrib/grap2graph/grap2graph.1
EXTRA_DIST += \
$(grap2graph_srcdir)/grap2graph.sh \
$(grap2graph_srcdir)/grap2graph.1.man
diff --git a/contrib/groff_filenames/groff_filenames.am
b/contrib/groff_filenames/groff_filenames.am
index d98ee12..5fe9eae 100644
--- a/contrib/groff_filenames/groff_filenames.am
+++ b/contrib/groff_filenames/groff_filenames.am
@@ -26,7 +26,7 @@
########################################################################
-man5_MANS += contrib/groff_filenames/groff_filenames.n
+man5_MANS += contrib/groff_filenames/groff_filenames.5
EXTRA_DIST += \
contrib/groff_filenames/ChangeLog \
contrib/groff_filenames/groff_filenames.5.man
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index f3365ed..7b64ca8 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -70,13 +70,13 @@ grofferdir = $(groffer_dir)
bin_SCRIPTS += groffer $(ROFF2PROGS)
groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh
man1_MANS += \
- 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
+ contrib/groffer/groffer.1 \
+ contrib/groffer/roff2dvi.1 \
+ contrib/groffer/roff2html.1 \
+ contrib/groffer/roff2pdf.1 \
+ contrib/groffer/roff2ps.1 \
+ contrib/groffer/roff2text.1 \
+ contrib/groffer/roff2x.1
MOSTLYCLEANFILES += $(ROFF2MAN)
$(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index dd634a1..ba18ce1 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -22,7 +22,7 @@
hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
hdtbl_builddir = $(top_builddir)/contrib/hdtbl
-man7_MANS += contrib/hdtbl/groff_hdtbl.n
+man7_MANS += contrib/hdtbl/groff_hdtbl.7
# Groff command used to generate .ps files
HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index 76fdc25..abdc071 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -26,10 +26,10 @@ mm_builddir = $(top_builddir)/contrib/mm
bin_SCRIPTS += mmroff
-man1_MANS += contrib/mm/mmroff.n
+man1_MANS += contrib/mm/mmroff.1
man7_MANS += \
- contrib/mm/groff_mm.n \
- contrib/mm/groff_mmse.n
+ contrib/mm/groff_mm.7 \
+ contrib/mm/groff_mmse.7
# Files installed in $(tmacdir)/mm
MMFILES = \
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 08d1d7d..9b66c81 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -32,7 +32,7 @@ MOMPDFMOM = \
PDFMOM_BIN_PATH="$(top_builddir)" \
$(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG)
-man7_MANS += contrib/mom/groff_mom.n
+man7_MANS += contrib/mom/groff_mom.7
# Files installed in $(tmacdir).
# MOMNORMALFILES are located in the source tree.
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 13c1020..6b02d42 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -23,7 +23,7 @@
pdfmark_srcdir = $(top_srcdir)/contrib/pdfmark
pdfmark_builddir = $(top_builddir)/contrib/pdfmark
-man1_MANS += contrib/pdfmark/pdfroff.n
+man1_MANS += contrib/pdfmark/pdfroff.1
bin_SCRIPTS += pdfroff
diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph.am
index 008cbfd..7913667 100644
--- a/contrib/pic2graph/pic2graph.am
+++ b/contrib/pic2graph/pic2graph.am
@@ -21,7 +21,7 @@
#
pic2graph_srcdir = $(top_srcdir)/contrib/pic2graph
-man1_MANS += contrib/pic2graph/pic2graph.n
+man1_MANS += contrib/pic2graph/pic2graph.1
bin_SCRIPTS += pic2graph
EXTRA_DIST += \
contrib/pic2graph/pic2graph.sh \
diff --git a/man/man.am b/man/man.am
index d5b50b6..1818257 100644
--- a/man/man.am
+++ b/man/man.am
@@ -19,15 +19,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
man5_MANS += \
- man/groff_font.n \
- man/groff_out.n \
- man/groff_tmac.n
+ man/groff_font.5 \
+ man/groff_out.5 \
+ man/groff_tmac.5
man7_MANS += \
- man/ditroff.n \
- man/groff_char.n \
- man/groff_diff.n \
- man/groff.n \
- man/roff.n
+ man/ditroff.7 \
+ man/groff_char.7 \
+ man/groff_diff.7 \
+ man/groff.7 \
+ man/roff.7
EXTRA_DIST += \
man/groff_font.5.man \
man/groff_out.5.man \
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index d1bfe48..8583083 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -24,7 +24,7 @@ grodvi_LDADD = \
libdriver.a \
libgroff.a \
lib/libgnu.a $(LIBM)
-man1_MANS += src/devices/grodvi/grodvi.n
+man1_MANS += src/devices/grodvi/grodvi.1
EXTRA_DIST += src/devices/grodvi/grodvi.1.man
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index de00fea..3969a57 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -32,7 +32,7 @@ post_grohtml_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
-man1_MANS += src/devices/grohtml/grohtml.n
+man1_MANS += src/devices/grohtml/grohtml.1
EXTRA_DIST += src/devices/grohtml/grohtml.1.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index a81c48f..505e8b4 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -28,7 +28,7 @@ grolbp_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
-man1_MANS += src/devices/grolbp/grolbp.n
+man1_MANS += src/devices/grolbp/grolbp.1
EXTRA_DIST += src/devices/grolbp/grolbp.1.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 35acb7d..680f5db 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -24,8 +24,8 @@ grolj4_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
-man1_MANS += src/devices/grolj4/grolj4.n
-man5_MANS += src/devices/grolj4/lj4_font.n
+man1_MANS += src/devices/grolj4/grolj4.1
+man5_MANS += src/devices/grolj4/lj4_font.5
EXTRA_DIST += \
src/devices/grolj4/grolj4.1.man \
src/devices/grolj4/lj4_font.5.man
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index ece55f1..54d04b1 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -31,8 +31,8 @@ EXTRA_DIST += \
src/devices/gropdf/pdfmom.1.man
man1_MANS += \
- src/devices/gropdf/gropdf.n \
- src/devices/gropdf/pdfmom.n
+ src/devices/gropdf/gropdf.1 \
+ src/devices/gropdf/pdfmom.1
gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
$(RM) $@
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index 41adf1c..bd816f3 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -27,7 +27,7 @@ grops_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
-man1_MANS += src/devices/grops/grops.n
+man1_MANS += src/devices/grops/grops.1
EXTRA_DIST += \
src/devices/grops/grops.1.man \
src/devices/grops/psfig.diff \
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index 3dcc809..0e4a59a 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -24,7 +24,7 @@ grotty_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
-man1_MANS += src/devices/grotty/grotty.n
+man1_MANS += src/devices/grotty/grotty.1
EXTRA_DIST += \
src/devices/grotty/grotty.1.man \
src/devices/grotty/TODO
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index f2b4261..53c1c8e 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -46,7 +46,7 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
CLEANFILES += $(XDITVIEW_GENHDRS)
-man1_MANS += src/devices/xditview/gxditview.n
+man1_MANS += src/devices/xditview/gxditview.1
# 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 8eb836a..8622fff 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -45,7 +45,7 @@ eqn_SOURCES = \
src/preproc/eqn/pbox.h \
src/preproc/eqn/eqn.h
-PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
+PREFIXMAN1 += src/preproc/eqn/eqn.1 src/preproc/eqn/neqn.1
EXTRA_DIST += \
src/preproc/eqn/TODO \
src/preproc/eqn/neqn.sh \
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index f64d551..fab54dc 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -27,7 +27,7 @@ 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.n
+PREFIXMAN1 += src/preproc/grn/grn.1
EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.1.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index bfdd76e..fb2637d 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -38,7 +38,7 @@ pic_SOURCES = \
pic_CPPFLAGS = $(AM_CPPFLAGS) \
-I $(top_srcdir)/src/preproc/pic \
-I $(top_builddir)/src/preproc/pic
-PREFIXMAN1 += src/preproc/pic/pic.n
+PREFIXMAN1 += src/preproc/pic/pic.1
src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
EXTRA_DIST += \
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index b4d7132..942eb0a 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -21,7 +21,7 @@
bin_PROGRAMS += preconv
preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
preconv_SOURCES = src/preproc/preconv/preconv.cpp
-man1_MANS += src/preproc/preconv/preconv.n
+man1_MANS += src/preproc/preconv/preconv.1
EXTRA_DIST += src/preproc/preconv/preconv.1.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index a879eba..2d931c6 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -31,7 +31,7 @@ refer_SOURCES = \
src/preproc/refer/ref.h \
src/preproc/refer/token.h \
src/preproc/refer/command.h
-PREFIXMAN1 += src/preproc/refer/refer.n
+PREFIXMAN1 += src/preproc/refer/refer.1
EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
CLEANFILES += \
src/preproc/refer/label.cpp \
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index ad4901e..f8839fa 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -21,7 +21,7 @@
prefixexecbin_PROGRAMS += soelim
soelim_LDADD = libgroff.a $(LIBM)
soelim_SOURCES = src/preproc/soelim/soelim.cpp
-PREFIXMAN1 += src/preproc/soelim/soelim.n
+PREFIXMAN1 += src/preproc/soelim/soelim.1
EXTRA_DIST += \
src/preproc/soelim/TODO \
src/preproc/soelim/soelim.1.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index b83ce77..a641d3d 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -24,7 +24,7 @@ tbl_SOURCES = \
src/preproc/tbl/main.cpp \
src/preproc/tbl/table.cpp \
src/preproc/tbl/table.h
-PREFIXMAN1 += src/preproc/tbl/tbl.n
+PREFIXMAN1 += src/preproc/tbl/tbl.1
EXTRA_DIST += src/preproc/tbl/tbl.1.man
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 6007e40..11c4fa6 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -35,7 +35,7 @@ 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.n
+man1_MANS += src/roff/groff/groff.1
EXTRA_DIST += src/roff/groff/groff.1.man
GROFF_OPTS_OUTPUT = \
groff_opts_no_arg.txt \
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index 1aa6b69..2b668f0 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -29,7 +29,7 @@ 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.n
+man1_MANS += src/roff/grog/grog.1
EXTRA_DIST += \
src/roff/grog/grog.1.man \
src/roff/grog/grog.pl
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 526efe9..4c14200 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -20,7 +20,7 @@
prefixexecbin_SCRIPTS += nroff
nroff_srcdir = $(top_srcdir)/src/roff/nroff
-PREFIXMAN1 += src/roff/nroff/nroff.n
+PREFIXMAN1 += src/roff/nroff/nroff.1
EXTRA_DIST += \
src/roff/nroff/nroff.1.man \
src/roff/nroff/nroff.sh
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 9ddacbc..648ec24 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
prefixexecbin_PROGRAMS += troff
-PREFIXMAN1 += src/roff/troff/troff.n
+PREFIXMAN1 += src/roff/troff/troff.1
EXTRA_DIST += \
src/roff/troff/column.cpp \
src/roff/troff/troff.1.man \
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index c399de6..9947979 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -23,7 +23,7 @@
########################################################################
bin_PROGRAMS += addftinfo
-man1_MANS += src/utils/addftinfo/addftinfo.n
+man1_MANS += src/utils/addftinfo/addftinfo.1
EXTRA_DIST += src/utils/addftinfo/addftinfo.1.man
addftinfo_LDADD = libgroff.a
addftinfo_SOURCES = \
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index f38870e..1bfc0c5 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -26,7 +26,7 @@
afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
bin_SCRIPTS += afmtodit
-man1_MANS += src/utils/afmtodit/afmtodit.n
+man1_MANS += src/utils/afmtodit/afmtodit.1
EXTRA_DIST += \
src/utils/afmtodit/afmtodit.1.man \
src/utils/afmtodit/afmtodit.pl \
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index 0c06262..ab847b8 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -23,7 +23,7 @@
########################################################################
bin_PROGRAMS += hpftodit
-man1_MANS += src/utils/hpftodit/hpftodit.n
+man1_MANS += src/utils/hpftodit/hpftodit.1
EXTRA_DIST += src/utils/hpftodit/hpftodit.1.man
hpftodit_LDADD = libgroff.a $(LIBM)
hpftodit_SOURCES = \
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index fc30587..7bdfc1a 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -25,7 +25,7 @@ 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.n
+PREFIXMAN1 += src/utils/indxbib/indxbib.1
EXTRA_DIST += \
src/utils/indxbib/indxbib.1.man \
src/utils/indxbib/eign
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 471025a..e797795 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS += lkbib
-man1_MANS += src/utils/lkbib/lkbib.n
+man1_MANS += src/utils/lkbib/lkbib.1
EXTRA_DIST += src/utils/lkbib/lkbib.1.man
lkbib_LDADD = libbib.a libgroff.a $(LIBM)
lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index b2e22de..3369d90 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
prefixexecbin_PROGRAMS += lookbib
-PREFIXMAN1 += src/utils/lookbib/lookbib.n
+PREFIXMAN1 += src/utils/lookbib/lookbib.1
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.am b/src/utils/pfbtops/pfbtops.am
index 1869c5b..5216be2 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS += pfbtops
-man1_MANS += src/utils/pfbtops/pfbtops.n
+man1_MANS += src/utils/pfbtops/pfbtops.1
EXTRA_DIST += src/utils/pfbtops/pfbtops.1.man
pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
pfbtops_LDADD = libgroff.a $(LIBM)
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 6c6494a..277869a 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS += tfmtodit
-man1_MANS += src/utils/tfmtodit/tfmtodit.n
+man1_MANS += src/utils/tfmtodit/tfmtodit.1
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.am b/src/utils/xtotroff/xtotroff.am
index 8d4fce6..14a84bd 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -20,7 +20,7 @@
if !WITHOUT_X11
bin_PROGRAMS += xtotroff
-man1_MANS += src/utils/xtotroff/xtotroff.n
+man1_MANS += src/utils/xtotroff/xtotroff.1
xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c
XLIBS=$(LIBXUTIL) $(LIBGROFF)
xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 1bda6e4..784027d 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -23,12 +23,12 @@ tmac_srcdir = $(top_srcdir)/tmac
tmac_builddir = $(top_builddir)/tmac
man7_MANS += \
- tmac/groff_ms.n \
- tmac/groff_man.n \
- tmac/groff_me.n \
- tmac/groff_mdoc.n \
- tmac/groff_trace.n \
- tmac/groff_www.n
+ tmac/groff_ms.7 \
+ tmac/groff_man.7 \
+ tmac/groff_me.7 \
+ tmac/groff_mdoc.7 \
+ tmac/groff_trace.7 \
+ tmac/groff_www.7
TMACNORMALFILES = \
tmac/man.tmac \
--
Bertrand Garrigues