config: upgrade to util-macros 1.8 for additional man page support

Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.

Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

5 files changed, 47 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 5fa1514..48561ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = bdftruncate ucs2any
 
 AM_CFLAGS = $(CWARNFLAGS)
@@ -52,33 +53,12 @@ mapfiles_DATA = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = fontutil.pc
 
-appmandir = $(APP_MAN_DIR)
-appman_PRE = bdftruncate.man ucs2any.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+CLEANFILES = bdftruncate
 
-CLEANFILES = bdftruncate $(appman_DATA)
-
-EXTRA_DIST = $(mapfiles_DATA) $(appman_PRE)
+EXTRA_DIST = $(mapfiles_DATA)
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-SED = sed
-
-MAN_SUBSTS = \
-        -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-        -e 's|__mapfilesdir__|$(mapfilesdir)|g' \
-        -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
diff --git a/configure.ac b/configure.ac
index f3b63c3..bc08ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,10 @@ AC_INIT(font-util, [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 AM_CONFIG_HEADER(config.h)
 
 XORG_DEFAULT_OPTIONS
@@ -52,4 +52,9 @@ AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR],
 MAPDIR="$mapdir"
 AC_SUBST(MAPDIR)
 
-AC_OUTPUT([Makefile fontutil.m4 fontutil.pc])
+AC_CONFIG_FILES([Makefile
+                 man/Makefile
+                 fontutil.m4
+                 fontutil.pc])
+
+AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..bf8199f
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = bdftruncate.man ucs2any.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAN_SUBSTS += -e 's|__mapfilesdir__|$(MAPDIR)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/bdftruncate.man b/man/bdftruncate.man
index 55cc0b7..55cc0b7 100644
--- a/bdftruncate.man
+++ b/man/bdftruncate.man
diff --git a/ucs2any.man b/man/ucs2any.man
index 0a619f4..0a619f4 100644
--- a/ucs2any.man
+++ b/man/ucs2any.man