Install man page in section 6.

The manual page of the standard fortune program is part of section 6
(Games Manuals), so the tfortune man page should be installed there
as well rather than in section 1.

diff --git a/.gitignore b/.gitignore
index 442c3ef24e52ba32707c90f0b4a5e37a67bd8b27..c2b3735eaccdcf78e72dc8030a025356859ae8ec 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ config.mak
 config.log
 config.status
 configure.sh
 config.log
 config.status
 configure.sh

-*.1
+*.6

 *.lsg.*
 *.flex.*
 *.bison.*
 *.lsg.*
 *.flex.*
 *.bison.*

diff --git a/Makefile b/Makefile
index aefbe2113aff8fe195acdf07e91b4bbfd96fdac2..d81133a6db5ce52354ed04e0e92ae1c4298c9ada 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ LICENSE_URL := https://www.gnu.org/licenses/gpl-3.0-standalone.html
 HOME_URL := http://people.tuebingen.mpg.de/maan/
 
 define DESCRIPTION1 :=
 HOME_URL := http://people.tuebingen.mpg.de/maan/
 
 define DESCRIPTION1 :=

-       Like fortune(1), tfortune is a Unix command line utility which prints
+       Like fortune(6), tfortune is a Unix command line utility which prints

        a random epigram. Epigrams are stored as plain text files, but they
        must be annotated with tags to make full use of the features which
        tfortune offers over other implementations.
        a random epigram. Epigrams are stored as plain text files, but they
        must be annotated with tags to make full use of the features which
        tfortune offers over other implementations.


@@ -57,7 +57,7 @@ cc_version := $(shell $(CC) --version | head -n 1)
 build_date := $(shell date)
 uname_rs := $(shell uname -rs)
 
 build_date := $(shell date)
 uname_rs := $(shell uname -rs)
 

-all := tfortune tfortune.1
+all := tfortune tfortune.6

 all: $(all)
 
 deps := txp.bison.d txp.flex.d ast.d tfortune.d util.d txp.flex.d \
 all: $(all)
 
 deps := txp.bison.d txp.flex.d ast.d tfortune.d util.d txp.flex.d \


@@ -116,7 +116,7 @@ index.html tfortune.suite: %: %.m4
        $(call SAY, LSGH $<)
        $(LOPSUBGEN) --gen-header < $<
 
        $(call SAY, LSGH $<)
        $(LOPSUBGEN) --gen-header < $<
 

-%.1: %.suite version.c
+%.6: %.suite version.c

        $(call SAY, LSGM $<)
        $(LOPSUBGEN) --gen-man=$@ --version-string $(GIT_VERSION) < $<
 
        $(call SAY, LSGM $<)
        $(LOPSUBGEN) --gen-man=$@ --version-string $(GIT_VERSION) < $<
 


@@ -182,14 +182,14 @@ tfortune: $(deps:.d=.o)
 mostlyclean:
        $(RM) tfortune *.o *.d
 clean: mostlyclean
 mostlyclean:
        $(RM) tfortune *.o *.d
 clean: mostlyclean

-       $(RM) *.lsg.* *.flex.* *.bison.* *.1 *.suite
+       $(RM) *.lsg.* *.flex.* *.bison.* *.6 *.suite

 distclean: clean
        $(RM) config.mak config.status config.log config.h config.h.in version.c
        $(RM) -r autom4te.cache
 maintainer-clean:
        git clean -dfqx > /dev/null 2>&1
 
 distclean: clean
        $(RM) config.mak config.status config.log config.h config.h.in version.c
        $(RM) -r autom4te.cache
 maintainer-clean:
        git clean -dfqx > /dev/null 2>&1
 

-mandir := $(datarootdir)/man/man1
+mandir := $(datarootdir)/man/man6

 INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL) -m 755
 INSTALL_DATA ?= $(INSTALL) -m 644
 INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL) -m 755
 INSTALL_DATA ?= $(INSTALL) -m 644


@@ -200,7 +200,7 @@ endif
 install install-strip: all
        $(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
        $(INSTALL_PROGRAM) $(strip_option) tfortune $(DESTDIR)$(bindir)
 install install-strip: all
        $(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
        $(INSTALL_PROGRAM) $(strip_option) tfortune $(DESTDIR)$(bindir)

-       $(INSTALL_DATA) tfortune.1 $(DESTDIR)$(mandir)
+       $(INSTALL_DATA) tfortune.6 $(DESTDIR)$(mandir)

 
 define README :=
 tfortune - $(SLOGAN)
 
 define README :=
 tfortune - $(SLOGAN)


@@ -221,8 +221,8 @@ Resources
 
 Documentation
 ~~~~~~~~~~~~~
 
 Documentation
 ~~~~~~~~~~~~~

-See tfortune.suite. Or build the man page with \"make tfortune.1\"
-and run \"man -l tfortune.1\".
+See tfortune.suite. Or build the man page with \"make tfortune.6\"
+and run \"man -l tfortune.6\".

 
 Dependencies
 ~~~~~~~~~~~~
 
 Dependencies
 ~~~~~~~~~~~~

diff --git a/tfortune.suite.m4 b/tfortune.suite.m4
index 91d00c30a34f01b79c89c5ebf58fa91ec80c094d..ce0324a5297340df53db8de6581bee444d4c53d6 100644 (file)
--- a/tfortune.suite.m4
+++ b/tfortune.suite.m4
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 [suite tfortune]
 # SPDX-License-Identifier: GPL-3.0-only
 
 [suite tfortune]

+mansect = 6
+manual_title = Games Manual

 caption = Subcommands
 [supercommand tfortune]
        purpose = SLOGAN()
 caption = Subcommands
 [supercommand tfortune]
        purpose = SLOGAN()