Build, installation, and distribution of man files

5 files changed, 47 insertions, 48 deletions

diff --git a/Makefile.am b/Makefile.am
index a6e1bc4e2..f353193b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -540,6 +540,7 @@ include $(top_srcdir)/font/devpdf/devpdf.am
 include $(top_srcdir)/font/devps/devps.am
 include $(top_srcdir)/font/devutf8/devutf8.am
 include $(top_srcdir)/font/scripts/scripts.am
+include $(top_srcdir)/man/man.am
 include $(top_srcdir)/src/include/include.am
 include $(top_srcdir)/src/libs/libbib/libbib.am
 include $(top_srcdir)/src/libs/libdriver/libdriver.am
@@ -632,7 +633,7 @@ EXTRA_DIST += \
   README.MinGW \
   arch/djgpp
 
-MOSTLYCLEANFILES += $(man1_MANS) $(man5_MANS)
+MOSTLYCLEANFILES += $(man1_MANS) $(man5_MANS) $(man7_MANS)
 
 # Rule to build .man files. The brackets around the @ are used to prevent the 
 # substitution of the variable by automake. 
diff --git a/TESTS b/TESTS
index e61f75384..6da07d053 100644
--- a/TESTS
+++ b/TESTS
@@ -238,8 +238,8 @@ Differences with former build system:
 
   - programs from src/utils are installed in $(DESTDIR)/usr/local/bin
 
-  - man files from src/utils, src/devices are installed in
-    $(DESTDIR)/usr/local/share/man/man1 or man5
+  - man files from man, src/utils, src/devices are installed in
+    $(DESTDIR)/usr/local/share/man/man1, man5 and man7
 
   - $(DESTDIR)/usr/local/share/groff/1.22.3/eign (from src/utils/indxbib)
 
diff --git a/configure.ac b/configure.ac
index 31111b084..fa315a703 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,7 @@ GROFF_INSTALL_SH
 GROFF_INSTALL_INFO
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 # use a dummy substitution if no csh hack is necessary to avoid errors
 # with non-GNU sed programs
diff --git a/man/Makefile.sub b/man/Makefile.sub
deleted file mode 100644
index fb151b560..000000000
--- a/man/Makefile.sub
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile.sub for `man'
-#
-# File position: <groff-source>/man/Makefile.sub
-#
-# Copyright (C) 2014
-#   Free Software Foundation, Inc.
-#
-# Last update: 2 Sep 2014
-#
-# This file is part of `font utf8' which 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 Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# `groff' is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/gpl-2.0.html>.
-#
-########################################################################
-
-MAN5=\
-  groff_font.n \
-  groff_out.n \
-  groff_tmac.n
-MAN7=\
-  ditroff.n \
-  groff_char.n \
-  groff_diff.n \
-  groff.n \
-  roff.n
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/man/man.am b/man/man.am
new file mode 100644
index 000000000..9658ad33f
--- /dev/null
+++ b/man/man.am
@@ -0,0 +1,42 @@
+# Copyright (C) 2014
+#   Free Software Foundation, Inc.
+#
+# 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 Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# `groff' is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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
+man7_MANS += \
+  man/ditroff.n \
+  man/groff_char.n \
+  man/groff_diff.n \
+  man/groff.n \
+  man/roff.n
+EXTRA_DIST += \
+  man/groff_font.man \
+  man/groff_out.man \
+  man/groff_tmac.man \
+  man/ditroff.man \
+  man/groff_char.man \
+  man/groff_diff.man \
+  man/groff.man \
+  man/roff.man
+
+# Case of out-of-source build: we must create the 'man' directory.
+BUILT_SOURCES += man
+man:
+	$(MKDIR_P) $(top_builddir)/man