configure: use @-style substitutions for man pages instead of __-style

Moves substitution of variables from Makefile.am to configure.ac
in preparation for allowing meson.build to do the same.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/test/x11perf/-/merge_requests/9>

5 files changed, 13 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index 8c737b8..74ae439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,11 @@ yes)
 	;;
 esac
 
+# Substitute config variables in man pages
+AC_CONFIG_FILES([man/x11perf.1:man/x11perf.man])
+AC_CONFIG_FILES([man/x11perfcomp.1:man/x11perfcomp.man])
+AC_CONFIG_FILES([man/Xmark.1:man/Xmark.man])
+
 AC_CONFIG_FILES([
 	Makefile
 	man/Makefile])
diff --git a/man/Makefile.am b/man/Makefile.am
index 14c63bd..adc119b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -5,8 +5,3 @@ appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# 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/man/Xmark.man b/man/Xmark.man
index 4e91162..215e7b7 100644
--- a/man/Xmark.man
+++ b/man/Xmark.man
@@ -1,6 +1,6 @@
 .\" This manpage was written by Richard Braakman and is licensed under the
 .\" XFree86 license.
-.TH Xmark 1 __xorgversion__
+.TH Xmark 1 "@PACKAGE_STRING@" "@XORG_MAN_PAGE@"
 .SH NAME
 Xmark \- summarize x11perf results
 .SH SYNTAX
@@ -63,4 +63,4 @@ by x11perf in the expected way.
 .BR "Diagnostic: ERROR: sum of weights =" nnn ", not equal to 4566.0;"
 There is an internal error in Xmark.
 .SH "SEE ALSO"
-X(__miscmansuffix__), x11perf(__appmansuffix__), x11perfcomp(__appmansuffix__)
+X(@MISC_MAN_SUFFIX@), x11perf(@APP_MAN_SUFFIX@), x11perfcomp(@APP_MAN_SUFFIX@)
diff --git a/man/x11perf.man b/man/x11perf.man
index d7746e4..59d2f4d 100644
--- a/man/x11perf.man
+++ b/man/x11perf.man
@@ -24,7 +24,7 @@
 .\" from The Open Group.
 .\"
 .\"
-.TH X11PERF 1 __xorgversion__
+.TH X11PERF 1 "@PACKAGE_STRING@" "@XORG_MAN_PAGE@"
 .SH NAME
 x11perf \- X11 server performance test program
 .SH SYNTAX
@@ -86,7 +86,7 @@ may be able to use the numbers
 reports to predict its performance on a given X implementation.
 .PP
 That said, you might also want to look at
-.I x11perfcomp(__appmansuffix__),
+.I x11perfcomp(@APP_MAN_SUFFIX@),
 a program to compare the outputs of different
 .I x11perf
 runs.  You provide a list of files containing results from
@@ -1040,7 +1040,7 @@ Circulate unmapped window to top.
 .SH X DEFAULTS
 There are no X defaults used by this program.
 .SH "SEE ALSO"
-X(__miscmansuffix__), x11perfcomp(__appmansuffix__)
+X(@MISC_MAN_SUFFIX@), x11perfcomp(@APP_MAN_SUFFIX@)
 .SH AUTHORS
 Joel McCormack
 .br
diff --git a/man/x11perfcomp.man b/man/x11perfcomp.man
index 4f567d2..0c8b013 100644
--- a/man/x11perfcomp.man
+++ b/man/x11perfcomp.man
@@ -23,7 +23,7 @@
 .\" from The Open Group.
 .\"
 .\"
-.TH X11PERFCOMP 1 __xorgversion__
+.TH X11PERFCOMP 1 "@PACKAGE_STRING@" "@XORG_MAN_PAGE@"
 .SH NAME
 x11perfcomp \- X11 server performance comparison program
 .SH SYNTAX
@@ -33,7 +33,7 @@ x11perfcomp \- X11 server performance comparison program
 The
 .I x11perfcomp
 program merges the output of several
-.I x11perf(__appmansuffix__)
+.I x11perf(@APP_MAN_SUFFIX@)
 runs into a nice tabular
 format.  It takes the results in each file, fills in any missing test results if
 necessary, and for each test shows the objects/second rate of each server.
@@ -73,7 +73,7 @@ Specifies a label file to use.
 .SH X DEFAULTS
 There are no X defaults used by this program.
 .SH "SEE ALSO"
-X(__miscmansuffix__), x11perf(__appmansuffix__)
+X(@MISC_MAN_SUFFIX@), x11perf(@APP_MAN_SUFFIX@)
 .SH AUTHORS
 Mark Moraes wrote the original scripts to compare servers.
 .br