man: s/__/@/g

A cosmetic change for automake (though we have to replicate some of
xorg-macros.m4 in manpages.am now), but meson's configure_file() wants
@-delimited strings.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>

24 files changed, 339 insertions, 323 deletions

diff --git a/hw/dmx/config/man/dmxtodmx.man b/hw/dmx/config/man/dmxtodmx.man
index 68c7f5b40..e93948755 100644
--- a/hw/dmx/config/man/dmxtodmx.man
+++ b/hw/dmx/config/man/dmxtodmx.man
@@ -26,7 +26,7 @@
 .\" Authors:
 .\"   Rickard E. (Rik) Faith <faith@redhat.com>
 .\"
-.TH dmxtodmx 1 __vendorversion__
+.TH dmxtodmx 1 @vendorversion@
 .SH NAME
 dmxtodmx - dmx configuration file parser and printer
 .SH SYNOPSIS
diff --git a/hw/dmx/config/man/vdltodmx.man b/hw/dmx/config/man/vdltodmx.man
index b733db7ab..aa5b4244f 100644
--- a/hw/dmx/config/man/vdltodmx.man
+++ b/hw/dmx/config/man/vdltodmx.man
@@ -26,7 +26,7 @@
 .\" Authors:
 .\"   Rickard E. (Rik) Faith <faith@redhat.com>
 .\"
-.TH vdltodmx 1 __vendorversion__
+.TH vdltodmx 1 @vendorversion@
 .SH NAME
 vdltodmx - dmx configuration file parser and printer
 .SH SYNOPSIS
diff --git a/hw/dmx/config/man/xdmxconfig.man b/hw/dmx/config/man/xdmxconfig.man
index dcceea0e3..45b6b9bcc 100644
--- a/hw/dmx/config/man/xdmxconfig.man
+++ b/hw/dmx/config/man/xdmxconfig.man
@@ -26,7 +26,7 @@
 .\" Authors:
 .\"   Rickard E. (Rik) Faith <faith@redhat.com>
 .\"
-.TH xdmxconfig 1 __vendorversion__
+.TH xdmxconfig 1 @vendorversion@
 .SH NAME
 xdmxconfig - a graphical configuration tool for Xdmx configuration files
 .SH SYNOPSIS
diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
index 4a25fdc66..ef62a02f5 100644
--- a/hw/dmx/man/Xdmx.man
+++ b/hw/dmx/man/Xdmx.man
@@ -22,7 +22,7 @@
 .\" 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.
-.TH Xdmx 1 __vendorversion__
+.TH Xdmx 1 @vendorversion@
 .SH NAME
 Xdmx - Distributed Multi-head X server
 .SH SYNOPSIS
@@ -48,7 +48,7 @@ communicates to the back-end X servers using the standard X11 protocol,
 and standard and/or commonly available X server extensions.
 .SH OPTIONS
 In addition to the normal X server options described in the
-.I Xserver(__appmansuffix__)
+.I Xserver(@appmansuffix@)
 manual page,
 .I Xdmx
 accepts the following command line switches:
@@ -136,7 +136,7 @@ the "xfree86" keycodes and the "pc104" symbols should be used to
 initialize the keyboard.  For an SGI keyboard, ",xkb,sgi/indy(pc102)"
 might be useful.  A list of keycodes, symbols, and geometries can be
 found in
-.IR __xkbdir__ .
+.IR @xkbdir@ .
 Use of keycodes, symbols and geometries for XKB configuration is
 deprecated in favor of the rules, layout, model, variant and options
 settings available via the -param command line switch.
@@ -341,31 +341,31 @@ This option specifies parameters on the command line.  Currently, only
 parameters dealing with XKEYBOARD configuration are supported.  These
 parameters apply only to the core keyboard.  Parameter values are
 installation-dependent.  Please see
-.I __xkbdir__
+.I @xkbdir@
 or a similar directory for complete information.
 .RS
 .TP 8
 .B XkbRules
-Defaults to "__XKB_DFLT_RULES__".  Other values may include "sgi" and "sun".
+Defaults to "@XKB_DFLT_RULES@".  Other values may include "sgi" and "sun".
 .sp
 .TP 8
 .B XkbModel
-Defaults to "__XKB_DFLT_MODEL__".  When used with "base" rules, other values
+Defaults to "@XKB_DFLT_MODEL@".  When used with "base" rules, other values
 may include "pc102", "pc104", "microsoft", and many others.  When
 used with "sun" rules, other values may include "type4" and "type5".
 .sp
 .TP 8
 .B XkbLayout
-Defaults to "__XKB_DFLT_LAYOUT__".  Other country codes and "dvorak" are usually
+Defaults to "@XKB_DFLT_LAYOUT@".  Other country codes and "dvorak" are usually
 available.
 .sp
 .TP 8
 .B XkbVariant
-Defaults to "__XKB_DFLT_VARIANT__".
+Defaults to "@XKB_DFLT_VARIANT@".
 .sp
 .TP 8
 .B XkbOptions
-Defaults to "__XKB_DFLT_OPTIONS__".
+Defaults to "@XKB_DFLT_OPTIONS@".
 .RE
 .SH "CONFIGURATION FILE GRAMMAR"
 The following words and tokens are reserved:
@@ -711,10 +711,10 @@ translated if it was the first core keyboard.
 .SH FILES
 ..
 .SH "SEE ALSO"
-.BR DMX "(__libmansuffix__), " X "(__miscmansuffix__), "
-.BR Xserver "(__appmansuffix__), " xdmxconfig "(__appmansuffix__), "
-.BR vdltodmx "(__appmansuffix__), " xfs "(__appmansuffix__), "
-.BR xkbcomp "(__appmansuffix__), " xkeyboard-config "(__miscmansuffix__)"
+.BR DMX "(@libmansuffix@), " X "(@miscmansuffix@), "
+.BR Xserver "(@appmansuffix@), " xdmxconfig "(@appmansuffix@), "
+.BR vdltodmx "(@appmansuffix@), " xfs "(@appmansuffix@), "
+.BR xkbcomp "(@appmansuffix@), " xkeyboard-config "(@miscmansuffix@)"
 .SH AUTHORS
 Kevin E. Martin
 .I <kem@redhat.com>,
diff --git a/hw/kdrive/Xkdrive.man b/hw/kdrive/Xkdrive.man
index c3e2089bc..4a5ee21c4 100644
--- a/hw/kdrive/Xkdrive.man
+++ b/hw/kdrive/Xkdrive.man
@@ -1,6 +1,6 @@
 .\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $
 .\"
-.TH Xkdrive 1 __vendorversion__
+.TH Xkdrive 1 @vendorversion@
 .SH NAME
 Xkdrive \- tiny X server
 .SH SYNOPSIS
@@ -44,7 +44,7 @@ enable emulation of a middle mouse button by chording.
 .B -3button
 disable emulation of a middle mouse button by chording.
 .SH SEE ALSO
-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
+X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
 .SH AUTHORS
 The Xkdrive common core was written by Keith Packard,
 and is based on the Sample Implementation of X.
diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index c04379035..cc8a80f21 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.TH Xephyr __appmansuffix__ __vendorversion__
+.TH Xephyr @appmansuffix@ @vendorversion@
 .SH NAME
 Xephyr - X server outputting to a window on a pre-existing X display
 .SH SYNOPSIS
@@ -39,7 +39,7 @@ uses the host X server window as "framebuffer" via fast SHM XImages.
 It also has support for "visually" debugging what the server is
 painting.
 .SH OPTIONS
-The server accepts all the standard options of Xserver(__appmansuffix__)
+The server accepts all the standard options of Xserver(@appmansuffix@)
 and the following additional options:
 .TP 8
 .BI -screen " width" x height
@@ -91,6 +91,6 @@ Keyboard handling is basic but works.
 .IP \(bu 2
 Mouse button 5 probably won't work.
 .SH "SEE ALSO"
-X(__miscmansuffix__), Xserver(__appmansuffix__)
+X(@miscmansuffix@), Xserver(@appmansuffix@)
 .SH AUTHOR
 Matthew Allum <mallum@o-hand.com> 2004
diff --git a/hw/vfb/man/Xvfb.man b/hw/vfb/man/Xvfb.man
index 95b4dd4c1..5fd58eb66 100644
--- a/hw/vfb/man/Xvfb.man
+++ b/hw/vfb/man/Xvfb.man
@@ -26,7 +26,7 @@
 .\"
 .\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.9 2001/12/14 19:59:45 dawes Exp $
 .\"
-.TH XVFB 1 __xorgversion__
+.TH XVFB 1 @xorgversion@
 .SH NAME
 Xvfb \- virtual framebuffer X server for X Version 11
 .SH SYNOPSIS
@@ -120,6 +120,6 @@ xwud -in /var/tmp/Xvfb_screen0
 Displays screen 0 of the server started by the preceding example.
 .SH "SEE ALSO"
 .PP
-X(__miscmansuffix__), Xserver(1), xwd(1), xwud(1), XWDFile.h
+X(@miscmansuffix@), Xserver(1), xwd(1), xwud(1), XWDFile.h
 .SH AUTHORS
 David P. Wiggins, The Open Group, Inc.
diff --git a/hw/xfree86/drivers/modesetting/modesetting.man b/hw/xfree86/drivers/modesetting/modesetting.man
index a42da1c1f..d90352380 100644
--- a/hw/xfree86/drivers/modesetting/modesetting.man
+++ b/hw/xfree86/drivers/modesetting/modesetting.man
@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH MODESETTING __drivermansuffix__ __vendorversion__
+.TH MODESETTING @drivermansuffix@ @vendorversion@
 .SH NAME
 modesetting \- video driver for framebuffer device
 .SH SYNOPSIS
@@ -14,7 +14,7 @@ modesetting \- video driver for framebuffer device
 .fi
 .SH DESCRIPTION
 .B modesetting
-is an __xservername__ driver for KMS devices.  This is a non-accelerated
+is an @xservername@ driver for KMS devices.  This is a non-accelerated
 driver, the following framebuffer depths are supported: 8, 15, 16, 24.
 All visual types are supported for depth 8, and TrueColor visual is
 supported for the other depths.  RandR 1.2 is supported.
@@ -24,7 +24,7 @@ The
 driver supports all hardware where a KMS driver is available.
 modesetting uses the Linux DRM KMS ioctls and dumb object create/map.
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to @xconfigfile@(@filemansuffix@) for general configuration
 details.  This section only covers configuration details specific to
 this driver.
 .PP
@@ -69,7 +69,7 @@ Option \*qZaphodHeads\*q \*qLVDS,VGA-0\*q
 will assign xrandr outputs LVDS and VGA-0 to this instance of the driver.
 .TP
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__),
-X(__miscmansuffix__)
+@xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@),
+X(@miscmansuffix@)
 .SH AUTHORS
 Authors include: Dave Airlie
diff --git a/hw/xfree86/exa/man/exa.man b/hw/xfree86/exa/man/exa.man
index 42a8de31d..c051b998b 100644
--- a/hw/xfree86/exa/man/exa.man
+++ b/hw/xfree86/exa/man/exa.man
@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH EXA __drivermansuffix__ __vendorversion__
+.TH EXA @drivermansuffix@ @vendorversion@
 .SH NAME
 exa \- new 2D acceleration architecture for X.Org
 .SH DESCRIPTION
@@ -36,7 +36,7 @@ default is intended to be the best performing one for general use, though others
 may help with specific use cases.  Available options include \*qalways\*q,
 \*qgreedy\*q, and \*qsmart\*q.  Default: always.
 .SH "SEE ALSO"
-.BR Xorg (__appmansuffix__),
-.BR xorg.conf(__filemansuffix__).
+.BR Xorg (@appmansuffix@),
+.BR xorg.conf(@filemansuffix@).
 .SH AUTHORS
 Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel D\(:anzer
diff --git a/hw/xfree86/fbdevhw/man/fbdevhw.man b/hw/xfree86/fbdevhw/man/fbdevhw.man
index fa46df08f..f9e8aaf41 100644
--- a/hw/xfree86/fbdevhw/man/fbdevhw.man
+++ b/hw/xfree86/fbdevhw/man/fbdevhw.man
@@ -1,5 +1,5 @@
 .\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $
-.TH FBDEVHW __drivermansuffix__ __vendorversion__
+.TH FBDEVHW @drivermansuffix@ @vendorversion@
 .SH NAME
 fbdevhw \- os-specific submodule for framebuffer device access
 .SH DESCRIPTION
@@ -10,13 +10,13 @@ A
 .B fbdevhw
 module is currently available for linux framebuffer devices.
 .PP
-fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the
+fbdev(@drivermansuffix@) is a non-accelerated driver which runs on top of the
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-Xorg(__appmansuffix__), xorg.conf(__filemansuffix__),
-xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
-fbdev(__drivermansuffix__)
+Xorg(@appmansuffix@), xorg.conf(@filemansuffix@),
+xorgconfig(@appmansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@),
+fbdev(@drivermansuffix@)
 .SH AUTHORS
 Authors include: Gerd Knorr, based on the XF68_FBDev Server code
 (Martin Schaller, Geert Uytterhoeven).
diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index 68672172c..13a9dc3b3 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -1,7 +1,7 @@
 .\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH Xorg __appmansuffix__ __vendorversion__
+.TH Xorg @appmansuffix@ @vendorversion@
 .SH NAME
 Xorg - X11R7 X server
 .SH SYNOPSIS
@@ -33,8 +33,8 @@ free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD,
 OpenBSD, and Solaris.  Commercial UNIX operating systems such as
 UnixWare are also supported.  Other supported operating systems include
 GNU Hurd.  Mac OS X is supported with the
-Xquartz(__appmansuffix__) X server.  Win32/Cygwin is supported with the
-XWin(__appmansuffix__) X server.
+Xquartz(@appmansuffix@) X server.  Win32/Cygwin is supported with the
+XWin(@appmansuffix@) X server.
 .PP
 .SH "NETWORK CONNECTIONS"
 .B Xorg
@@ -45,7 +45,7 @@ byte-streams:
 On most platforms, the "Local" connection type is a UNIX-domain socket.
 On some System V platforms, the "local" connection types also include
 STREAMS pipes, named pipes, and some other mechanisms.  See the
-"LOCAL CONNECTIONS" section of X(__miscmansuffix__) for details.
+"LOCAL CONNECTIONS" section of X(@miscmansuffix@) for details.
 .TP 4
 .I TCP/IP
 .B Xorg
@@ -61,20 +61,20 @@ option (see the Xserver(1) man page for details).
 .B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-xorg.conf(__filemansuffix__) configuration files, auto-detection, and
+xorg.conf(@filemansuffix@) configuration files, auto-detection, and
 fallback defaults.  When the same information is supplied in more than
 one way, the highest precedence mechanism is used.  The list of mechanisms
 is ordered from highest precedence to lowest.  Note that not all parameters
 can be supplied via all methods.  The available command line options
 and environment variables (and some defaults) are described here and in
-the Xserver(__appmansuffix__) manual page.  Most configuration file
+the Xserver(@appmansuffix@) manual page.  Most configuration file
 parameters, with their defaults, are described in the
-xorg.conf(__filemansuffix__) manual page.  Driver and module specific
+xorg.conf(@filemansuffix@) manual page.  Driver and module specific
 configuration parameters are described in the relevant driver or module
 manual page.
 .PP
 In addition to the normal server options described in the
-Xserver(__appmansuffix__) manual page,
+Xserver(@appmansuffix@) manual page,
 .B Xorg
 accepts the following command line switches:
 .TP 8
@@ -92,14 +92,14 @@ as Linux, BSD, OpenSolaris, SVR3, and SVR4.
 Allow the server to start up even if the mouse device can't be opened
 or initialised.  This is equivalent to the
 .B AllowMouseOpenFail
-xorg.conf(__filemansuffix__) file option.
+xorg.conf(@filemansuffix@) file option.
 .TP 8
 .B \-allowNonLocalXvidtune
 Make the VidMode extension available to remote clients.  This allows
 the xvidtune client to connect from another host.  This is equivalent
 to the
 .B AllowNonLocalXvidtune
-xorg.conf(__filemansuffix__) file option.  By default non-local
+xorg.conf(@filemansuffix@) file option.  By default non-local
 connections are not allowed.
 .TP 8
 .BI \-bgamma " value"
@@ -139,7 +139,7 @@ config directory search path for all other users.
 When this option is specified, the
 .B Xorg
 server loads all video driver modules, probes for available hardware,
-and writes out an initial xorg.conf(__filemansuffix__) file based on
+and writes out an initial xorg.conf(@filemansuffix@) file based on
 what was detected.  This option currently has some problems on some
 platforms, but in most cases it is a good way to bootstrap the
 configuration process.  This option is only available when the server
@@ -159,7 +159,7 @@ Disable the parts of the VidMode extension (used by the xvidtune
 client) that can be used to change the video modes.  This is equivalent
 to the
 .B DisableVidModeExtension
-xorg.conf(__filemansuffix__) file option.
+xorg.conf(@filemansuffix@) file option.
 .TP 8
 .B \-fbbpp \fIn\fP
 Sets the number of framebuffer bits per pixel.  You should only set this
@@ -226,7 +226,7 @@ want to use systemd-logind integration you must specify this option.
 Not all platforms support (or can use) this option.
 .TP 8
 .BI \-keyboard " keyboard-name"
-Use the xorg.conf(__filemansuffix__) file
+Use the xorg.conf(@filemansuffix@) file
 .B InputDevice
 section called
 .I keyboard-name
@@ -238,7 +238,7 @@ section and this option, the first relevant
 section is used for the core keyboard.
 .TP 8
 .BI \-layout " layout-name"
-Use the xorg.conf(__filemansuffix__) file
+Use the xorg.conf(@filemansuffix@) file
 .B Layout
 section called
 .IR layout-name .
@@ -252,7 +252,7 @@ Use the file called
 as the
 .B Xorg
 server log file.  The default log file when running as root is
-.BI __logdir__/Xorg. n .log
+.BI @logdir@/Xorg. n .log
 and for non root it is
 .BI $XDG_DATA_HOME/xorg/Xorg. n .log
 where
@@ -291,7 +291,7 @@ Disable the automatic switching on X server reset and shutdown to the
 VT that was active when the server started, if supported by the OS.
 .TP 8
 .BI \-pointer " pointer-name"
-Use the xorg.conf(__filemansuffix__) file
+Use the xorg.conf(@filemansuffix@) file
 .B InputDevice
 section called
 .I pointer-name
@@ -321,7 +321,7 @@ options.
 Share virtual terminals with another X server, if supported by the OS.
 .TP 8
 .BI \-screen " screen-name"
-Use the xorg.conf(__filemansuffix__) file
+Use the xorg.conf(@filemansuffix@) file
 .B Screen
 section called
 .IR screen-name .
@@ -385,7 +385,7 @@ keymap.
 Immediately kills the server -- no questions asked. It can be disabled by
 setting the
 .B DontZap
-xorg.conf(__filemansuffix__) file option to a TRUE value.
+xorg.conf(@filemansuffix@) file option to a TRUE value.
 .PP
 .RS 8
 It should be noted that zapping is triggered by the
@@ -399,20 +399,20 @@ but can be enabled with the XKB option
 Change video mode to next one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-xorg.conf(__filemansuffix__) file option.
+xorg.conf(@filemansuffix@) file option.
 .TP 8
 .B Ctrl+Alt+Keypad-Minus
 Change video mode to previous one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-xorg.conf(__filemansuffix__) file option.
+xorg.conf(@filemansuffix@) file option.
 .TP 8
 .B Ctrl+Alt+F1...F12
 For systems with virtual terminal support, these keystroke
 combinations are used to switch to virtual terminals 1 through 12,
 respectively.  This can be disabled with the
 .B DontVTSwitch
-xorg.conf(__filemansuffix__) file option.
+xorg.conf(@filemansuffix@) file option.
 .SH CONFIGURATION
 .B Xorg
 typically uses a configuration file called
@@ -420,9 +420,9 @@ typically uses a configuration file called
 and configuration files with the suffix
 .I .conf
 in a directory called
-.B __xconfigdir__
+.B @xconfigdir@
 for its initial setup.
-Refer to the xorg.conf(__filemansuffix__) manual page for information
+Refer to the xorg.conf(@filemansuffix@) manual page for information
 about the format of this file.
 .PP
 .B Xorg
@@ -430,7 +430,7 @@ has a mechanism for automatically generating a built-in configuration
 at run-time when no
 .B xorg.conf
 file or
-.B __xconfigdir__
+.B @xconfigdir@
 files are present.  The current version of this automatic configuration
 mechanism works in two ways.
 .PP
@@ -454,7 +454,7 @@ supported by Xorg.  Enhancements are planned for future releases.
 The
 .B Xorg
 server config files can be found in a range of locations.  These are
-documented fully in the xorg.conf(__filemansuffix__) manual page.  The
+documented fully in the xorg.conf(@filemansuffix@) manual page.  The
 most commonly used locations are shown here.
 .TP 30
 .B /etc/X11/xorg.conf
@@ -466,95 +466,95 @@ Server configuration file.
 .B /etc/xorg.conf
 Server configuration file.
 .TP 30
-.B __projectroot__/etc/xorg.conf
+.B @projectroot@/etc/xorg.conf
 Server configuration file.
 .TP 30
-.B __projectroot__/lib/X11/xorg.conf
+.B @projectroot@/lib/X11/xorg.conf
 Server configuration file.
 .TP 30
-.B /etc/X11/__xconfigdir__
+.B /etc/X11/@xconfigdir@
 Server configuration directory.
 .TP 30
-.B /etc/X11/__xconfigdir__-4
+.B /etc/X11/@xconfigdir@-4
 Server configuration directory.
 .TP 30
-.B /etc/__xconfigdir__
+.B /etc/@xconfigdir@
 Server configuration directory.
 .TP 30
-.B __projectroot__/etc/__xconfigdir__
+.B @projectroot@/etc/@xconfigdir@
 Server configuration directory.
 .TP 30
-.B __projectroot__/lib/X11/__xconfigdir__
+.B @projectroot@/lib/X11/@xconfigdir@
 Server configuration directory.
 .TP 30
-.BI __logdir__/Xorg. n .log
+.BI @logdir@/Xorg. n .log
 Server log file for display
 .IR n .
 .TP 30
-.B __projectroot__/bin/\(**
+.B @projectroot@/bin/\(**
 Client binaries.
 .TP 30
-.B __projectroot__/include/\(**
+.B @projectroot@/include/\(**
 Header files.
 .TP 30
-.B __projectroot__/lib/\(**
+.B @projectroot@/lib/\(**
 Libraries.
 .TP 30
-.B __datadir__/fonts/X11/\(**
+.B @datadir@/fonts/X11/\(**
 Fonts.
 .TP 30
-.B __projectroot__/share/X11/XErrorDB
+.B @projectroot@/share/X11/XErrorDB
 Client error message database.
 .TP 30
-.B __projectroot__/lib/X11/app-defaults/\(**
+.B @projectroot@/lib/X11/app-defaults/\(**
 Client resource specifications.
 .TP 30
-.B __mandir__/man?/\(**
+.B @mandir@/man?/\(**
 Manual pages.
 .TP 30
 .BI /etc/X n .hosts
 Initial access control list for display
 .IR n .
 .SH "SEE ALSO"
-X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
-xorg.conf(__filemansuffix__), xvidtune(__appmansuffix__),
-xkeyboard-config (__miscmansuffix__),
-apm(__drivermansuffix__),
-ati(__drivermansuffix__),
-chips(__drivermansuffix__),
-cirrus(__drivermansuffix__),
-cyrix(__drivermansuffix__),
-fbdev(__drivermansuffix__),
-glide(__drivermansuffix__),
-glint(__drivermansuffix__),
-i128(__drivermansuffix__),
-i740(__drivermansuffix__),
-imstt(__drivermansuffix__),
-intel(__drivermansuffix__),
-mga(__drivermansuffix__),
-neomagic(__drivermansuffix__),
-nsc(__drivermansuffix__),
-nv(__drivermansuffix__),
-openchrome (__drivermansuffix__),
-r128(__drivermansuffix__),
-rendition(__drivermansuffix__),
-s3virge(__drivermansuffix__),
-siliconmotion(__drivermansuffix__),
-sis(__drivermansuffix__),
-sunbw2(__drivermansuffix__),
-suncg14(__drivermansuffix__),
-suncg3(__drivermansuffix__),
-suncg6(__drivermansuffix__),
-sunffb(__drivermansuffix__),
-sunleo(__drivermansuffix__),
-suntcx(__drivermansuffix__),
-tdfx(__drivermansuffix__),
-tga(__drivermansuffix__),
-trident(__drivermansuffix__),
-tseng(__drivermansuffix__),
-v4l(__drivermansuffix__),
-vesa(__drivermansuffix__),
-vmware(__drivermansuffix__),
+X(@miscmansuffix@), Xserver(@appmansuffix@), xdm(@appmansuffix@), xinit(@appmansuffix@),
+xorg.conf(@filemansuffix@), xvidtune(@appmansuffix@),
+xkeyboard-config (@miscmansuffix@),
+apm(@drivermansuffix@),
+ati(@drivermansuffix@),
+chips(@drivermansuffix@),
+cirrus(@drivermansuffix@),
+cyrix(@drivermansuffix@),
+fbdev(@drivermansuffix@),
+glide(@drivermansuffix@),
+glint(@drivermansuffix@),
+i128(@drivermansuffix@),
+i740(@drivermansuffix@),
+imstt(@drivermansuffix@),
+intel(@drivermansuffix@),
+mga(@drivermansuffix@),
+neomagic(@drivermansuffix@),
+nsc(@drivermansuffix@),
+nv(@drivermansuffix@),
+openchrome (@drivermansuffix@),
+r128(@drivermansuffix@),
+rendition(@drivermansuffix@),
+s3virge(@drivermansuffix@),
+siliconmotion(@drivermansuffix@),
+sis(@drivermansuffix@),
+sunbw2(@drivermansuffix@),
+suncg14(@drivermansuffix@),
+suncg3(@drivermansuffix@),
+suncg6(@drivermansuffix@),
+sunffb(@drivermansuffix@),
+sunleo(@drivermansuffix@),
+suntcx(@drivermansuffix@),
+tdfx(@drivermansuffix@),
+tga(@drivermansuffix@),
+trident(@drivermansuffix@),
+tseng(@drivermansuffix@),
+v4l(@drivermansuffix@),
+vesa(@drivermansuffix@),
+vmware(@drivermansuffix@),
 .br
 Web site
 .IR <http://www.x.org> .
diff --git a/hw/xfree86/man/Xorg.wrap.man b/hw/xfree86/man/Xorg.wrap.man
index f3f30a6c4..a8ee5eae8 100644
--- a/hw/xfree86/man/Xorg.wrap.man
+++ b/hw/xfree86/man/Xorg.wrap.man
@@ -1,4 +1,4 @@
-.\" Xwrapper.wrap.__appmansuffix__
+.\" Xwrapper.wrap.@appmansuffix@
 .\"
 .\" Copyright 2014 Red Hat, Inc.
 .\"
@@ -26,14 +26,14 @@
 .\"
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH Xorg.wrap __appmansuffix__ __xorgversion__
+.TH Xorg.wrap @appmansuffix@ @xorgversion@
 .SH NAME
 Xorg.wrap \- Xorg X server binary wrapper
 .SH DESCRIPTION
 The Xorg X server may need root rights to function properly. To start the
 Xorg X server with these rights your system is using a suid root wrapper
-installed as __suid_wrapper_dir__/Xorg.wrap which will execute the real
-X server which is installed as __suid_wrapper_dir__/Xorg.
+installed as @suid_wrapper_dir@/Xorg.wrap which will execute the real
+X server which is installed as @suid_wrapper_dir@/Xorg.
 .PP
 By default Xorg.wrap will autodetect if root rights are necessary, and
 if not it will drop its elevated rights before starting the real X server.
@@ -42,7 +42,7 @@ sessions on a physical console.
 
 .SH CONFIG FILE
 Xorg.wrap's default behavior can be overridden from the
-\fI__sysconfdir__/X11/Xwrapper.config\fP config file. Lines starting with a
+\fI@sysconfdir@/X11/Xwrapper.config\fP config file. Lines starting with a
 \fB#\fP in Xwrapper.config are considered comments and will be ignored. Any
 other non empty lines must take the form of \fBkey\fP = \fIvalue\fP.
 .TP 8
diff --git a/hw/xfree86/man/Xwrapper.config.man b/hw/xfree86/man/Xwrapper.config.man
index 5c777c940..46bc65e2c 100644
--- a/hw/xfree86/man/Xwrapper.config.man
+++ b/hw/xfree86/man/Xwrapper.config.man
@@ -1 +1 @@
-.so man__appmansuffix__/Xorg.wrap.__appmansuffix__
+.so man@appmansuffix@/Xorg.wrap.@appmansuffix@
diff --git a/hw/xfree86/man/xorg.conf.d.man b/hw/xfree86/man/xorg.conf.d.man
index 6b3379ece..9ac2dbfbb 100644
--- a/hw/xfree86/man/xorg.conf.d.man
+++ b/hw/xfree86/man/xorg.conf.d.man
@@ -1 +1 @@
-.so man__filemansuffix__/xorg.conf.__filemansuffix__
+.so man@filemansuffix@/xorg.conf.@filemansuffix@
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 7e1c8e7e7..518d5bb78 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1,21 +1,21 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH xorg.conf __filemansuffix__ __vendorversion__
+.TH xorg.conf @filemansuffix@ @vendorversion@
 .SH NAME
-xorg.conf, __xconfigdir__ \- configuration files for
+xorg.conf, @xconfigdir@ \- configuration files for
 Xorg X server
 .SH INTRODUCTION
 .B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-xorg.conf and __xconfigdir__ configuration files, auto-detection,
+xorg.conf and @xconfigdir@ configuration files, auto-detection,
 and fallback defaults. When the same information is supplied in more
 than one way, the highest precedence mechanism is used. The list of
 mechanisms is ordered from highest precedence to lowest. Note that not
 all parameters can be supplied via all methods. The available command
 line options and environment variables (and some defaults) are
-described in the Xserver(__appmansuffix__) and
-Xorg(__appmansuffix__) manual pages. Most configuration file
+described in the Xserver(@appmansuffix@) and
+Xorg(@appmansuffix@) manual pages. Most configuration file
 parameters, with their defaults, are described below. Driver and module
 specific configuration parameters are described in the relevant driver
 or module manual page.
@@ -26,7 +26,7 @@ uses a configuration file called
 and files ending in the suffix
 .I .conf
 from the directory
-.I __xconfigdir__
+.I @xconfigdir@
 for its initial setup.
 The
 .I xorg.conf
@@ -36,15 +36,15 @@ server is started as a normal user:
 .RS 4
 .nf
 .IR /etc/X11/ <cmdline>
-.IR __projectroot__/etc/X11/ <cmdline>
+.IR @projectroot@/etc/X11/ <cmdline>
 .IB /etc/X11/ $XORGCONFIG
-.IB __projectroot__/etc/X11/ $XORGCONFIG
+.IB @projectroot@/etc/X11/ $XORGCONFIG
 .I /etc/X11/xorg.conf
 .I /etc/xorg.conf
-.IR __projectroot__/etc/X11/xorg.conf. <hostname>
-.I __projectroot__/etc/X11/xorg.conf
-.IR __projectroot__/lib/X11/xorg.conf. <hostname>
-.I __projectroot__/lib/X11/xorg.conf
+.IR @projectroot@/etc/X11/xorg.conf. <hostname>
+.I @projectroot@/etc/X11/xorg.conf
+.IR @projectroot@/lib/X11/xorg.conf. <hostname>
+.I @projectroot@/lib/X11/xorg.conf
 .fi
 .RE
 .PP
@@ -58,7 +58,7 @@ is the relative path (with no \(lq..\(rq components) specified by that
 environment variable, and
 .I <hostname>
 is the machine's hostname as reported by
-.BR gethostname (__libmansuffix__).
+.BR gethostname (@libmansuffix@).
 .PP
 When the Xorg server is started by the \(lqroot\(rq user, the config file
 search locations are as follows:
@@ -67,16 +67,16 @@ search locations are as follows:
 .nf
 <cmdline>
 .IR /etc/X11/ <cmdline>
-.IR __projectroot__/etc/X11/ <cmdline>
+.IR @projectroot@/etc/X11/ <cmdline>
 .B $XORGCONFIG
 .IB /etc/X11/ $XORGCONFIG
-.IB __projectroot__/etc/X11/ $XORGCONFIG
+.IB @projectroot@/etc/X11/ $XORGCONFIG
 .I /etc/X11/xorg.conf
 .I /etc/xorg.conf
-.IR __projectroot__/etc/X11/xorg.conf. <hostname>
-.I __projectroot__/etc/X11/xorg.conf
-.IR __projectroot__/lib/X11/xorg.conf. <hostname>
-.I __projectroot__/lib/X11/xorg.conf
+.IR @projectroot@/etc/X11/xorg.conf. <hostname>
+.I @projectroot@/etc/X11/xorg.conf
+.IR @projectroot@/lib/X11/xorg.conf. <hostname>
+.I @projectroot@/lib/X11/xorg.conf
 .fi
 .RE
 .PP
@@ -93,7 +93,7 @@ is the path specified by that environment variable (usually the home
 directory), and
 .I <hostname>
 is the machine's hostname as reported by
-.BR gethostname (__libmansuffix__).
+.BR gethostname (@libmansuffix@).
 .PP
 Additional configuration files are searched for in the following
 directories when the server is started as a normal user:
@@ -101,9 +101,9 @@ directories when the server is started as a normal user:
 .RS 4
 .nf
 .IR /etc/X11/ <cmdline>
-.IR __sysconfdir__/X11/ <cmdline>
-.I /etc/X11/__xconfigdir__
-.I __sysconfdir__/X11/__xconfigdir__
+.IR @sysconfdir@/X11/ <cmdline>
+.I /etc/X11/@xconfigdir@
+.I @sysconfdir@/X11/@xconfigdir@
 .fi
 .RE
 .PP
@@ -120,9 +120,9 @@ config directory search locations are as follows:
 .nf
 <cmdline>
 .IR /etc/X11/ <cmdline>
-.IR __sysconfdir__/X11/ <cmdline>
-.I /etc/X11/__xconfigdir__
-.I __sysconfdir__/X11/__xconfigdir__
+.IR @sysconfdir@/X11/ <cmdline>
+.I /etc/X11/@xconfigdir@
+.I @sysconfdir@/X11/@xconfigdir@
 .fi
 .RE
 .PP
@@ -140,14 +140,14 @@ These files are found in the following directory:
 .PP
 .RS 4
 .nf
-.I __datadir__/X11/__xconfigdir__
+.I @datadir@/X11/@xconfigdir@
 .fi
 .RE
 .PP
 The
 .I xorg.conf
 and
-.I __xconfigdir__
+.I @xconfigdir@
 files are composed of a number of sections which may be present in any order,
 or omitted to use default configuration values.
 Each section has the form:
@@ -330,9 +330,9 @@ The
 .B Files
 section is used to specify some path names required by the server.
 Some of these paths can also be set from the command line (see
-.BR Xserver (__appmansuffix__)
+.BR Xserver (@appmansuffix@)
 and
-.BR Xorg (__appmansuffix__)).
+.BR Xorg (@appmansuffix@)).
 The command line settings override the values specified in the config
 file.
 The
@@ -413,12 +413,12 @@ font path elements (which can be set inside a catalogue directory):
 .PP
 .RS 4
 .nf
-.I __datadir__/fonts/X11/misc/
-.I __datadir__/fonts/X11/TTF/
-.I __datadir__/fonts/X11/OTF/
-.I __datadir__/fonts/X11/Type1/
-.I __datadir__/fonts/X11/100dpi/
-.I __datadir__/fonts/X11/75dpi/
+.I @datadir@/fonts/X11/misc/
+.I @datadir@/fonts/X11/TTF/
+.I @datadir@/fonts/X11/OTF/
+.I @datadir@/fonts/X11/Type1/
+.I @datadir@/fonts/X11/100dpi/
+.I @datadir@/fonts/X11/75dpi/
 .fi
 .RE
 .PP
@@ -436,7 +436,7 @@ entries may be specified, and they will be concatenated to build the
 module search path used by the server.  The default module path is
 .PP
 .RS 11
-__modulepath__
+@modulepath@
 .RE
 .\" The LogFile keyword is not currently implemented
 .ig
@@ -446,7 +446,7 @@ sets the name of the Xorg server log file.
 The default log file name when running as root is
 .PP
 .RS 11
-.RI __logdir__/Xorg. <n> .log
+.RI @logdir@/Xorg. <n> .log
 .RE
 and for non root it is
 .RS 11
@@ -465,7 +465,7 @@ sets the base directory for keyboard layout files.  The
 command line option can be used to override this.  The default directory is
 .PP
 .RS 11
-__xkbdir__
+@xkbdir@
 .RE
 .SH "SERVERFLAGS SECTION"
 In addition to options specific to this section (described below), the
@@ -553,9 +553,9 @@ extension) to connect from another host.
 Default: off.
 .TP 7
 .BI "Option \*qAllowMouseOpenFail\*q  \*q" boolean \*q
-This tells the mousedrv(__drivermansuffix__) and vmmouse(__drivermansuffix__)
+This tells the mousedrv(@drivermansuffix@) and vmmouse(@drivermansuffix@)
 drivers to not report failure if the mouse device can't be opened/initialised.
-It has no effect on the evdev(__drivermansuffix__) or other drivers.
+It has no effect on the evdev(@drivermansuffix@) or other drivers.
 Default: false.
 .TP 7
 .BI "Option \*qBlankTime\*q  \*q" time \*q
@@ -567,7 +567,7 @@ is in minutes.
 This is equivalent to the Xorg server's
 .B \-s
 flag, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
+.BR xset(@appmansuffix@).
 Default: 10 minutes.
 .TP 7
 .BI "Option \*qStandbyTime\*q  \*q" time \*q
@@ -576,7 +576,7 @@ sets the inactivity timeout for the
 phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
+.BR xset(@appmansuffix@).
 Default: 10 minutes.
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.
@@ -590,7 +590,7 @@ sets the inactivity timeout for the
 phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
+.BR xset(@appmansuffix@).
 Default: 10 minutes.
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.
@@ -604,7 +604,7 @@ sets the inactivity timeout for the
 phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
+.BR xset(@appmansuffix@).
 Default: 10 minutes.
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.
@@ -754,7 +754,7 @@ subdirectory under:
 .PP
 .RS 4
 .nf
-__modulepath__
+@modulepath@
 .fi
 .RE
 .PP
@@ -871,11 +871,11 @@ or
 command line options, or if it is selected implicitly as the core pointer
 or keyboard device in the absence of such explicit references.
 The most commonly used input drivers are
-.BR evdev (__drivermansuffix__)
+.BR evdev (@drivermansuffix@)
 on Linux systems, and
-.BR kbd (__drivermansuffix__)
+.BR kbd (@drivermansuffix@)
 and
-.BR mousedrv (__drivermansuffix__)
+.BR mousedrv (@drivermansuffix@)
 on other platforms.
 .PP
 .PP
@@ -2159,7 +2159,7 @@ formats.
 This may also be specified from the command line with the
 .B \-weight
 option (see
-.BR Xorg(__appmansuffix__)).
+.BR Xorg(@appmansuffix@)).
 .TP 7
 .BI "Virtual  " "xdim ydim"
 This optional entry specifies the virtual screen resolution to be used.
@@ -2210,7 +2210,7 @@ built-in VESA standard modes.
 .BI "Visual  \*q" visual\-name \*q
 This optional entry sets the default root visual type.
 This may also be specified from the command line (see the
-.BR Xserver(__appmansuffix__)
+.BR Xserver(@appmansuffix@)
 man page).
 The visual types available for depth 8 are (default is
 .BR PseudoColor ):
@@ -2509,79 +2509,79 @@ The data therein is not used in this release.
 .PP
 .SH "SEE ALSO"
 General:
-.BR X (__miscmansuffix__),
-.BR Xserver (__appmansuffix__),
-.BR Xorg (__appmansuffix__),
-.BR cvt (__appmansuffix__),
-.BR gtf (__appmansuffix__).
+.BR X (@miscmansuffix@),
+.BR Xserver (@appmansuffix@),
+.BR Xorg (@appmansuffix@),
+.BR cvt (@appmansuffix@),
+.BR gtf (@appmansuffix@).
 .PP
 .B "Not all modules or interfaces are available on all platforms."
 .PP
 Display drivers:
-.BR apm (__drivermansuffix__),
-.BR ati (__drivermansuffix__),
-.BR chips (__drivermansuffix__),
-.BR cirrus (__drivermansuffix__),
-.BR cyrix (__drivermansuffix__),
-.BR fbdev (__drivermansuffix__),
-.BR glide (__drivermansuffix__),
-.BR glint (__drivermansuffix__),
-.BR i128 (__drivermansuffix__),
-.BR i740 (__drivermansuffix__),
-.BR imstt (__drivermansuffix__),
-.BR intel (__drivermansuffix__),
-.BR mga (__drivermansuffix__),
-.BR neomagic (__drivermansuffix__),
-.BR nv (__drivermansuffix__),
-.BR openchrome (__drivermansuffix__),
-.BR r128 (__drivermansuffix__),
-.BR radeon (__drivermansuffix__),
-.BR rendition (__drivermansuffix__),
-.BR savage (__drivermansuffix__),
-.BR s3virge (__drivermansuffix__),
-.BR siliconmotion (__drivermansuffix__),
-.BR sis (__drivermansuffix__),
-.BR sisusb (__drivermansuffix__),
-.BR sunbw2 (__drivermansuffix__),
-.BR suncg14 (__drivermansuffix__),
-.BR suncg3 (__drivermansuffix__),
-.BR suncg6 (__drivermansuffix__),
-.BR sunffb (__drivermansuffix__),
-.BR sunleo (__drivermansuffix__),
-.BR suntcx (__drivermansuffix__),
-.BR tdfx (__drivermansuffix__),
-.\" .BR tga (__drivermansuffix__),
-.BR trident (__drivermansuffix__),
-.BR tseng (__drivermansuffix__),
-.BR vesa (__drivermansuffix__),
-.BR vmware (__drivermansuffix__),
-.BR voodoo (__drivermansuffix__),
-.BR wsfb (__drivermansuffix__),
-.BR xgi (__drivermansuffix__),
-.BR xgixp (__drivermansuffix__).
+.BR apm (@drivermansuffix@),
+.BR ati (@drivermansuffix@),
+.BR chips (@drivermansuffix@),
+.BR cirrus (@drivermansuffix@),
+.BR cyrix (@drivermansuffix@),
+.BR fbdev (@drivermansuffix@),
+.BR glide (@drivermansuffix@),
+.BR glint (@drivermansuffix@),
+.BR i128 (@drivermansuffix@),
+.BR i740 (@drivermansuffix@),
+.BR imstt (@drivermansuffix@),
+.BR intel (@drivermansuffix@),
+.BR mga (@drivermansuffix@),
+.BR neomagic (@drivermansuffix@),
+.BR nv (@drivermansuffix@),
+.BR openchrome (@drivermansuffix@),
+.BR r128 (@drivermansuffix@),
+.BR radeon (@drivermansuffix@),
+.BR rendition (@drivermansuffix@),
+.BR savage (@drivermansuffix@),
+.BR s3virge (@drivermansuffix@),
+.BR siliconmotion (@drivermansuffix@),
+.BR sis (@drivermansuffix@),
+.BR sisusb (@drivermansuffix@),
+.BR sunbw2 (@drivermansuffix@),
+.BR suncg14 (@drivermansuffix@),
+.BR suncg3 (@drivermansuffix@),
+.BR suncg6 (@drivermansuffix@),
+.BR sunffb (@drivermansuffix@),
+.BR sunleo (@drivermansuffix@),
+.BR suntcx (@drivermansuffix@),
+.BR tdfx (@drivermansuffix@),
+.\" .BR tga (@drivermansuffix@),
+.BR trident (@drivermansuffix@),
+.BR tseng (@drivermansuffix@),
+.BR vesa (@drivermansuffix@),
+.BR vmware (@drivermansuffix@),
+.BR voodoo (@drivermansuffix@),
+.BR wsfb (@drivermansuffix@),
+.BR xgi (@drivermansuffix@),
+.BR xgixp (@drivermansuffix@).
 .PP
 Input drivers:
-.BR acecad (__drivermansuffix__),
-.BR citron (__drivermansuffix__),
-.BR elographics (__drivermansuffix__),
-.BR evdev (__drivermansuffix__),
-.BR fpit (__drivermansuffix__),
-.BR joystick (__drivermansuffix__),
-.BR kbd (__drivermansuffix__),
-.BR libinput (__drivermansuffix__),
-.BR mousedrv (__drivermansuffix__),
-.BR mutouch (__drivermansuffix__),
-.BR penmount (__drivermansuffix__),
-.BR synaptics (__drivermansuffix__),
-.BR vmmouse (__drivermansuffix__),
-.BR void (__drivermansuffix__),
-.BR wacom (__drivermansuffix__).
+.BR acecad (@drivermansuffix@),
+.BR citron (@drivermansuffix@),
+.BR elographics (@drivermansuffix@),
+.BR evdev (@drivermansuffix@),
+.BR fpit (@drivermansuffix@),
+.BR joystick (@drivermansuffix@),
+.BR kbd (@drivermansuffix@),
+.BR libinput (@drivermansuffix@),
+.BR mousedrv (@drivermansuffix@),
+.BR mutouch (@drivermansuffix@),
+.BR penmount (@drivermansuffix@),
+.BR synaptics (@drivermansuffix@),
+.BR vmmouse (@drivermansuffix@),
+.BR void (@drivermansuffix@),
+.BR wacom (@drivermansuffix@).
 .PP
 Other modules and interfaces:
-.BR exa (__drivermansuffix__),
-.BR fbdevhw (__drivermansuffix__),
-.\" .BR shadowfb (__drivermansuffix__),
-.BR v4l (__drivermansuffix__).
+.BR exa (@drivermansuffix@),
+.BR fbdevhw (@drivermansuffix@),
+.\" .BR shadowfb (@drivermansuffix@),
+.BR v4l (@drivermansuffix@).
 .br
 .SH AUTHORS
 This manual page was largely rewritten by David Dawes
diff --git a/hw/xfree86/utils/man/cvt.man b/hw/xfree86/utils/man/cvt.man
index 8d70ead1b..009ab6540 100644
--- a/hw/xfree86/utils/man/cvt.man
+++ b/hw/xfree86/utils/man/cvt.man
@@ -1,4 +1,4 @@
-.TH CVT 1 __vendorversion__
+.TH CVT 1 @vendorversion@
 .SH NAME
 cvt - calculate VESA CVT mode lines
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ cvt - calculate VESA CVT mode lines
 is a utility for calculating VESA Coordinated Video Timing modes.  Given the
 desired horizontal and vertical resolutions, a modeline adhering to the CVT
 standard is printed. This modeline can be included in Xorg
-.B xorg.conf(__filemansuffix__)
+.B xorg.conf(@filemansuffix@)
 .
 
 .SH OPTIONS
@@ -31,7 +31,7 @@ Create a mode with reduced blanking.  This allows for higher frequency signals,
 with a lower or equal dotclock. Not for Cathode Ray Tube based displays though.
 
 .SH "SEE ALSO"
-xorg.conf(__filemansuffix__), gtf(__appmansuffix__)
+xorg.conf(@filemansuffix@), gtf(@appmansuffix@)
 .SH AUTHOR
 Luc Verhaegen.
 .PP
diff --git a/hw/xfree86/utils/man/gtf.man b/hw/xfree86/utils/man/gtf.man
index 004d2f059..95bddbbcf 100644
--- a/hw/xfree86/utils/man/gtf.man
+++ b/hw/xfree86/utils/man/gtf.man
@@ -1,4 +1,4 @@
-.TH GTF 1 __vendorversion__
+.TH GTF 1 @vendorversion@
 .SH NAME
 gtf - calculate VESA GTF mode lines
 .SH SYNOPSIS
@@ -15,7 +15,7 @@ is a utility for calculating VESA GTF modes.  Given the desired
 horizontal and vertical resolutions and refresh rate (in Hz), the parameters
 for a matching VESA GTF mode are printed out.  Two output formats are
 supported: mode lines suitable for the Xorg
-.B xorg.conf(__filemansuffix__)
+.B xorg.conf(@filemansuffix@)
 file, and mode parameters suitable for the Linux
 .B fbset(8)
 utility.
@@ -34,7 +34,7 @@ default format.
 Print the mode parameters in a format suitable for
 .BR fbset(8) .
 .SH "SEE ALSO"
-xorg.conf(__filemansuffix__), cvt(__appmansuffix__)
+xorg.conf(@filemansuffix@), cvt(@appmansuffix@)
 .SH AUTHOR
 Andy Ritger.
 .PP
diff --git a/hw/xnest/man/Xnest.man b/hw/xnest/man/Xnest.man
index 024d88e82..e287b8e9c 100644
--- a/hw/xnest/man/Xnest.man
+++ b/hw/xnest/man/Xnest.man
@@ -27,7 +27,7 @@
 .\"
 .\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.6 2001/01/27 18:21:00 dawes Exp $
 .\"
-.TH Xnest __appmansuffix__ __xorgversion__
+.TH Xnest @appmansuffix@ @xorgversion@
 .SH NAME
 Xnest \- a nested X server
 .SH SYNOPSIS
@@ -52,7 +52,7 @@ appears to be a conventional server.
 .B Xnest
 supports all standard options of the sample server implementation.
 For more details, please see
-.BR Xserver (__appmansuffix__).
+.BR Xserver (@appmansuffix@).
 The following additional arguments are supported as well.
 .TP
 .BI "\-display " string
@@ -113,7 +113,7 @@ The class of the default visual of the nested server need not be the same as the
 class of the default visual of the real server, but it must be supported by the
 real server.
 Use
-.BR xdpyinfo (__appmansuffix__)
+.BR xdpyinfo (@appmansuffix@)
 to obtain a list of supported visual classes on the real server before starting
 .BR Xnest .
 If the user chooses a static class, all the colors in the default color map will
@@ -127,7 +127,7 @@ The depth of the default visual of the nested server need not be the same as the
 depth of the default visual of the real server, but it must be supported by the
 real server.
 Use
-.BR xdpyinfo (__appmansuffix__)
+.BR xdpyinfo (@appmansuffix@)
 to obtain a list of supported visual depths on the real server before starting
 .BR Xnest .
 .TP
@@ -149,7 +149,7 @@ This option specifies the geometry parameters for the top-level
 .B Xnest
 window.
 See \(lqGEOMETRY SPECIFICATIONS\(rq in
-.BR X (__miscmansuffix__)
+.BR X (@miscmansuffix@)
 for a discusson of this option's syntax.
 This window corresponds to the root window of the nested server.
 The width
@@ -200,7 +200,7 @@ specification.
 For example,
 .B xterm \-display :1.1
 will open an
-.BR xterm (__appmansuffix__)
+.BR xterm (@appmansuffix@)
 client in the nested server with the display number
 .B :1
 on the second screen.
@@ -249,7 +249,7 @@ as the root window instead of creating a window.
 Starting up
 .B Xnest
 is just as simple as starting up
-.BR xclock (__appmansuffix__)
+.BR xclock (@appmansuffix@)
 from a terminal emulator.
 If a user wishes to run
 .B Xnest
@@ -385,7 +385,7 @@ file system which makes the two font paths mutually incompatible.
 Thus, if there is a font in the local font path of the nested server, there is
 no guarantee that this font exists in the remote font path of the real server.
 The
-.BR xlsfonts (__appmansuffix__)
+.BR xlsfonts (@appmansuffix@)
 client, if run on the nested server, will list fonts in the local font path and,
 if run on the real server, will list fonts in the remote font path.
 Before a font can be successfully opened by the nested server, it has to exist
@@ -423,6 +423,6 @@ Probably has some memory leaks.
 .SH AUTHOR
 Davor Matic, MIT X Consortium
 .SH "SEE ALSO"
-.BR Xserver (__appmansuffix__),
-.BR xdpyinfo (__appmansuffix__),
-.BR X (__miscmansuffix__)
+.BR Xserver (@appmansuffix@),
+.BR xdpyinfo (@appmansuffix@),
+.BR X (@miscmansuffix@)
diff --git a/hw/xquartz/man/Xquartz.man b/hw/xquartz/man/Xquartz.man
index 0ea6e6eb8..df7ab25aa 100644
--- a/hw/xquartz/man/Xquartz.man
+++ b/hw/xquartz/man/Xquartz.man
@@ -1,4 +1,4 @@
-.TH XQUARTZ 1 __vendorversion__
+.TH XQUARTZ 1 @vendorversion@
 .SH NAME
 Xquartz \- X window system server for Mac OSX
 .SH SYNOPSIS
@@ -16,75 +16,75 @@ OS X handles the desktop background.
 .SH CUSTOMIZATION
 \fIXquartz\fP can be customized using the defaults(1) command. The available options are:
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 enable_fake_buttons -boolean true
+.B defaults write @bundle_id_prefix@.X11 enable_fake_buttons -boolean true
 Emulates a 3 button mouse using modifier keys. By default, the Command modifier
 is used to emulate button 2 and Option is used for button 3. Thus, clicking the
 first mouse button while holding down Command will act like clicking
 button 2. Holding down Option will simulate button 3.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 fake_button2 \fImodifiers\fP
+.B defaults write @bundle_id_prefix@.X11 fake_button2 \fImodifiers\fP
 Change the modifier keys used to emulate the second mouse button. By default,
 Command is used to emulate the second button. Any combination of the following
 modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 fake_button3 \fImodifiers\fP
+.B defaults write @bundle_id_prefix@.X11 fake_button3 \fImodifiers\fP
 Change the modifier keys used to emulate the second mouse button. By default,
 Command is used to emulate the second button. Any combination of the following
 modifier names may be used: {l,r,}shift, {l,r,}option, {l,r,}control, {l,r,}command, fn
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 fullscreen_hotkeys -boolean true
+.B defaults write @bundle_id_prefix@.X11 fullscreen_hotkeys -boolean true
 Enable OSX hotkeys while in fullscreen
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 fullscreen_menu -boolean true
+.B defaults write @bundle_id_prefix@.X11 fullscreen_menu -boolean true
 Show the OSX menu while in fullscreen
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 no_quit_alert -boolean true
+.B defaults write @bundle_id_prefix@.X11 no_quit_alert -boolean true
 Disables the alert dialog displayed when attempting to quit X11.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 no_auth -boolean true
+.B defaults write @bundle_id_prefix@.X11 no_auth -boolean true
 Stops the X server requiring that clients authenticate themselves when
-connecting.  See Xsecurity(__miscmansuffix__).
+connecting.  See Xsecurity(@miscmansuffix@).
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 nolisten_tcp -boolean false
+.B defaults write @bundle_id_prefix@.X11 nolisten_tcp -boolean false
 This will tell the server to listen and accept TCP connections.  Doing this without enabling
-xauth is a possible security concern.  See Xsecurity(__miscmansuffix__).
+xauth is a possible security concern.  See Xsecurity(@miscmansuffix@).
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 enable_system_beep -boolean false
+.B defaults write @bundle_id_prefix@.X11 enable_system_beep -boolean false
 Don't use the standard system beep effect for X11 alerts.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 enable_key_equivalents -boolean false
+.B defaults write @bundle_id_prefix@.X11 enable_key_equivalents -boolean false
 Disable menu keyboard equivalents while X11 windows are focused.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 depth \fIdepth\fP
+.B defaults write @bundle_id_prefix@.X11 depth \fIdepth\fP
 Specifies the color bit depth to use. Currently only 15, and 24 color
 bits per pixel are supported. If not specified, or a value of -1 is specified,
 defaults to the depth of the main display.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 sync_keymap -boolean true
+.B defaults write @bundle_id_prefix@.X11 sync_keymap -boolean true
 Keep the X11 keymap up to date with the OSX system keymap.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 option_sends_alt -boolean true
+.B defaults write @bundle_id_prefix@.X11 option_sends_alt -boolean true
 The Option key will send Alt_L and Alt_R instead of Mode_switch.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 sync_pasteboard -boolean true
+.B defaults write @bundle_id_prefix@.X11 sync_pasteboard -boolean true
 Enable syncing between the OSX pasteboard and clipboard/primary selection buffers in X11.  This option needs to be true for any of the other pasteboard sync options to have an effect.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 sync_pasteboard_to_clipboard -boolean true
+.B defaults write @bundle_id_prefix@.X11 sync_pasteboard_to_clipboard -boolean true
 Update the X11 CLIPBOARD when the OSX NSPasteboard is updated.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 sync_pasteboard_to_primary -boolean true
+.B defaults write @bundle_id_prefix@.X11 sync_pasteboard_to_primary -boolean true
 Update the the X11 PRIMARY buffer when the OSX NSPasteboard is updated.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 sync_clipboard_to_pasteboard -boolean true
+.B defaults write @bundle_id_prefix@.X11 sync_clipboard_to_pasteboard -boolean true
 Update the the OSX NSPasteboard when the X11 CLIPBOARD is updated.  Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11.  This makes it impossible to use xclipboard, klipper, or any other such clipboard managers.  If you want to use any of these programs, you must disable this option.
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 sync_primary_on_select -boolean true
+.B defaults write @bundle_id_prefix@.X11 sync_primary_on_select -boolean true
 This option defaults to false and is provided only "for experts."  It updates the NSPasteboard whenever a new X11 selection is made (rather than requiring you to hit cmd-c to copy the selection to the NSPasteboard).  Since the X11 protocol does not require applications to send notification when they change selection, this might not work in all cases (if you run into this problem, try selecting text in another application first, then selecting the text you want).
 .TP 8
-.B defaults write __bundle_id_prefix__.X11 enable_test_extensions -boolean true
+.B defaults write @bundle_id_prefix@.X11 enable_test_extensions -boolean true
 This option defaults to false and is only accessible through the command line.  Enable this option to turn on the DEC-XTRAP, RECORD, and XTEST extensions in the server.
 .TP 8
-.B defaults write __laucnd_id_prefix__.X11 scroll_in_device_direction -boolean true
+.B defaults write @laucnd_id_prefix@.X11 scroll_in_device_direction -boolean true
 This option defaults to false.  Enable this option to ensure that X11 scroll events are always in the direction of the device.  This overrides the related option in the Mouse/Trackpad section of System Preferences.
 .SH OPTIONS
 .PP
@@ -106,19 +106,19 @@ Same as fake_button3 above.
 .B "\-depth \fIdepth\fP"
 Same as depth above.
 .SH LOGGING
-XQuartz stores a server log at ~/Library/Logs/X11.__bundle_id_prefix__.log which
+XQuartz stores a server log at ~/Library/Logs/X11.@bundle_id_prefix@.log which
 is analogous to /var/log/Xorg.#.log on systems that use the XFree86 DDX such as
 Linux, BSD, and Solaris.
 .PP
 In addition to this server log, XQuartz sends messages to syslogd(8) using
-asl(3).  These logs are sent to the __bundle_id_prefix__ facility, and you can
+asl(3).  These logs are sent to the @bundle_id_prefix@ facility, and you can
 watch these logs using the following syslog(1) command:
 .TP 8
-.B $ syslog -w -k Facility eq __bundle_id_prefix__
+.B $ syslog -w -k Facility eq @bundle_id_prefix@
 .PP
 or you can include extra information such as the file, line, and function where the message originated:
 .TP 8
-.B $ syslog -w -F '$(Time) $(Sender) <$(Level)> $(File):$(Line) $(Function) :: $(Message)' -k Facility eq __bundle_id_prefix__
+.B $ syslog -w -F '$(Time) $(Sender) <$(Level)> $(File):$(Line) $(Function) :: $(Message)' -k Facility eq @bundle_id_prefix@
 .PP
 By default, XQaurtz sets an ASL mask which prevents it from logging messages
 below the ASL_LEVEL_WARNING level (meaning almost all logging is done strictly
@@ -134,7 +134,7 @@ you will need to adjust XQuartz's asl mask as above but using -i or -n
 instead of -d.
 .SH "SEE ALSO"
 .PP
-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), syslog(1), syslogd(8)
+X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), syslog(1), syslogd(8)
 .PP
 http://xquartz.macosforge.org
 .PP
diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index 2222293e0..2081ea1b9 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -1,4 +1,4 @@
-.TH XWIN 1 __vendorversion__
+.TH XWIN 1 @vendorversion@
 .SH NAME
 XWin \- X Server for the Cygwin environment on Microsoft Windows
 
@@ -293,7 +293,7 @@ and debugging purposes.
 .TP 8
 .B "\-logfile \fIfilename\fP"
 Change the server log file from the default of \fI
-__logdir__/XWin.n.log\fP,
+@logdir@/XWin.n.log\fP,
 where \fIn\fP is the display number of the XWin server, to \fIfilename\fP.
 .TP 8
 .B "\-logverbose \fIlevel\fP"
@@ -319,10 +319,10 @@ These options configure the xkeyboard extension to load
 a particular keyboard map as the X server starts.  The behavior is similar
 to the \fIsetxkbmap\fP(1) program.
 
-See the \fIxkeyboard-config\fP(__miscmansuffix__) manual page for a list of
+See the \fIxkeyboard-config\fP(@miscmansuffix@) manual page for a list of
 keyboard configurations.
 
-The keyboard layout data is located at \fI__datadir__/X11/xkb/\fP.  Additional information
+The keyboard layout data is located at \fI@datadir@/X11/xkb/\fP.  Additional information
 can be found in the README files there and in the \fIsetxkbmap\fP(1) manual page.
 
 For example, in order to load a German layout for a pc105 keyboard, use the options:
@@ -352,13 +352,13 @@ visual to operate in TrueColor modes.
 As it runs \fIXWin\fP writes messages indicating the most relevant events
 to  the console
 from which it was called and to a log file that by default is located at \fI
-__logdir__/XWin.0.log\fP.  This file is mainly for debugging purposes.
+@logdir@/XWin.0.log\fP.  This file is mainly for debugging purposes.
 
 
 .SH PREFERENCES FILE
 On startup \fIXWin\fP looks for the file \fI$HOME/.XWinrc\fP or, if
 the previous file does not exist, \fI
-__sysconfdir__/X11/system.XWinrc\fP.  \fI.XWinrc\fP allows setting
+@sysconfdir@/X11/system.XWinrc\fP.  \fI.XWinrc\fP allows setting
 preferences for the following:
 .br
 * To include items into the menu associated with the \fIXWin\fP icon
@@ -382,8 +382,8 @@ Need some examples
 
 
 .SH "SEE ALSO"
-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(__filemansuffix__),
-setxkbmap(1), xkeyboard-config(__miscmansuffix__).
+X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), XWinrc(@filemansuffix@),
+setxkbmap(1), xkeyboard-config(@miscmansuffix@).
 
 
 .SH BUGS
diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man
index 71d8dad23..0cc2d9d44 100644
--- a/hw/xwin/man/XWinrc.man
+++ b/hw/xwin/man/XWinrc.man
@@ -1,4 +1,4 @@
-.TH XWIN __filemansuffix__ __vendorversion__
+.TH XWIN @filemansuffix@ @vendorversion@
 
 
 .SH NAME
@@ -10,7 +10,7 @@ The X Server for the X Window System on the Cygwin/X environment
 running on Microsoft Windows, \fIXWin\fP can be optionally configured
 with the \fIXWinrc\fP file.  A system-wide configuration file should
 be placed in \fI
-__sysconfdir__/X11/system.XWinrc\fP, a per-user file
+@sysconfdir@/X11/system.XWinrc\fP, a per-user file
 should be put at \fI$HOME/.XWinrc\fP.  The \fIsystem.XWinrc\fP file is
 read only if no \fI$HOME/.XWinrc\fP exist.
 .PP
diff --git a/hw/xwin/winclipboard/xwinclip.man b/hw/xwin/winclipboard/xwinclip.man
index a53dc3029..73dfc8a94 100644
--- a/hw/xwin/winclipboard/xwinclip.man
+++ b/hw/xwin/winclipboard/xwinclip.man
@@ -1,4 +1,4 @@
-.TH xwinclip 1 __xorgversion__
+.TH xwinclip 1 @xorgversion@
 .SH NAME
 xwinclip - An X11 and Windows clipboard integration tool
 
diff --git a/man/Xserver.man b/man/Xserver.man
index 506e5bb70..31ffb8cff 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -26,7 +26,7 @@
 .\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH XSERVER 1 __xorgversion__
+.TH XSERVER 1 @xorgversion@
 .SH NAME
 Xserver \- X Window System display server
 .SH SYNOPSIS
@@ -73,7 +73,7 @@ should override values specified via other mechanisms.
 The X server runs as the given \fIdisplaynumber\fP, which by default is 0.
 If multiple X servers are to run simultaneously on a host, each must have
 a unique display number.  See the DISPLAY
-NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to
+NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
 specify which display number clients should try to use.
 .TP 8
 .B \-a \fInumber\fP
@@ -98,7 +98,7 @@ Audit lines are sent as standard error output.
 .B \-auth \fIauthorization-file\fP
 specifies a file which contains a collection of authorization records used
 to authenticate access.  See also the \fIxdm\fP(1) and
-\fIXsecurity\fP(__miscmansuffix__) manual pages.
+\fIXsecurity\fP(@miscmansuffix@) manual pages.
 .TP 8
 .BI \-background\ none
 Asks the driver not to clear the background on startup, if the driver supports that.
@@ -420,7 +420,7 @@ X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the
 following options.  All layout files specified on the command line must be
 located in the XKB base directory or a subdirectory, and specified as the
 relative path from the XKB base directory.  The default XKB base directory is
-.IR __projectroot__/lib/X11/xkb .
+.IR @projectroot@/lib/X11/xkb .
 .TP 8
 .BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
 enables(+) or disables(-) AccessX key sequences.
@@ -444,13 +444,13 @@ loads keyboard description in \fIfilename\fP on server startup.
 The X server supports client connections via a platform-dependent subset of
 the following transport types: TCP/IP, Unix Domain sockets,
 and several varieties of SVR4 local connections.  See the DISPLAY
-NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to
+NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
 specify which transport type clients should try to use.
 .SH GRANTING ACCESS
 The X server implements a platform-dependent subset of the following
 authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,
 XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the
-\fIXsecurity\fP(__miscmansuffix__) manual page for information on the
+\fIXsecurity\fP(@miscmansuffix@) manual page for information on the
 operation of these protocols.
 .PP
 Authorization data required by the above protocols is passed to the
@@ -537,7 +537,7 @@ the X server uses when trying to open a font is controlled
 by the \fIfont path\fP.
 .LP
 The default font path is
-__default_font_path__ .
+@default_font_path@ .
 .LP
 A special kind of directory can be specified using the \fBcatalogue\fP:
 prefix. Directories specified this way can contain symlinks pointing to the
@@ -583,22 +583,22 @@ the following font path:
 .I /etc/X\fBn\fP.hosts
 Initial access control list for display number \fBn\fP
 .TP 30
-.IR __datadir__/fonts/X11/misc , __datadir__/fonts/X11/75dpi , __datadir__/fonts/X11/100dpi
+.IR @datadir@/fonts/X11/misc , @datadir@/fonts/X11/75dpi , @datadir@/fonts/X11/100dpi
 Bitmap font directories
 .TP 30
-.IR __datadir__/fonts/X11/TTF , __datadir__/fonts/X11/Type1
+.IR @datadir@/fonts/X11/TTF , @datadir@/fonts/X11/Type1
 Outline font directories
 .TP 30
 .I /tmp/.X11-unix/X\fBn\fP
 Unix domain socket for display number \fBn\fP
 .TP 30
 .I /usr/adm/X\fBn\fPmsgs
-Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
+Error log file for display number \fBn\fP if run from \fIinit\fP(@adminmansuffix@)
 .TP 30
-.I __projectroot__/lib/X11/xdm/xdm-errors
+.I @projectroot@/lib/X11/xdm/xdm-errors
 Default error log file if the server is run from \fIxdm\fP(1)
 .SH "SEE ALSO"
-General information: \fIX\fP(__miscmansuffix__)
+General information: \fIX\fP(@miscmansuffix@)
 .PP
 Protocols:
 .I "X Window System Protocol,"
@@ -609,9 +609,9 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
 \fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),
 .I "X Logical Font Description Conventions"
 .PP
-Keyboards: \fIxkeyboard-config\fP(__miscmansuffix__)
+Keyboards: \fIxkeyboard-config\fP(@miscmansuffix@)
 .PP
-Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
+Security: \fIXsecurity\fP(@miscmansuffix@), \fIxauth\fP(1), \fIXau\fP(1),
 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
 .I "Security Extension Specification"
 .PP
diff --git a/manpages.am b/manpages.am
index 124bb5575..3ef3f08a6 100644
--- a/manpages.am
+++ b/manpages.am
@@ -16,23 +16,39 @@ EXTRA_DIST = $(appman_PRE) $(driverman_PRE) $(fileman_PRE)
 CLEANFILES = $(appman_DATA) $(driverman_DATA) $(fileman_DATA)
 SUFFIXES = .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
 
+# xorg-macros.m4 has these bracketed by double underscores, but meson
+# wants ats.
+
+MAN_SUBSTS +=   -e 's|@vendorversion@|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+                -e 's|@xorgversion@|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+                -e 's|@xservername@|Xorg|g' \
+                -e 's|@xconfigfile@|xorg.conf|g' \
+                -e 's|@projectroot@|\$(prefix)|g' \
+                -e 's|@apploaddir@|\$(appdefaultdir)|g' \
+                -e 's|@appmansuffix@|\$(APP_MAN_SUFFIX)|g' \
+                -e 's|@drivermansuffix@|\$(DRIVER_MAN_SUFFIX)|g' \
+                -e 's|@adminmansuffix@|\$(ADMIN_MAN_SUFFIX)|g' \
+                -e 's|@libmansuffix@|\$(LIB_MAN_SUFFIX)|g' \
+                -e 's|@miscmansuffix@|\$(MISC_MAN_SUFFIX)|g' \
+                -e 's|@filemansuffix@|\$(FILE_MAN_SUFFIX)|g'
+
 # Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS
 # 's|/,|/, |g' will add a space to help font path formatting
-MAN_SUBSTS += 	-e 's|__logdir__|$(logdir)|g' \
-		-e 's|__datadir__|$(datadir)|g' \
-		-e 's|__mandir__|$(mandir)|g' \
-		-e 's|__sysconfdir__|$(sysconfdir)|g' \
-		-e 's|__xconfigdir__|$(XCONFIGDIR)|g' \
-		-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
-		-e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \
-		-e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \
-		-e 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' \
-		-e 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' \
-		-e 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' \
-		-e 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' \
-		-e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \
-		-e 's|__suid_wrapper_dir__|$(SUID_WRAPPER_DIR)|g' \
-		-e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \
+MAN_SUBSTS += 	-e 's|@logdir@|$(logdir)|g' \
+		-e 's|@datadir@|$(datadir)|g' \
+		-e 's|@mandir@|$(mandir)|g' \
+		-e 's|@sysconfdir@|$(sysconfdir)|g' \
+		-e 's|@xconfigdir@|$(XCONFIGDIR)|g' \
+		-e 's|@xkbdir@|$(XKB_BASE_DIRECTORY)|g' \
+		-e 's|@XKB_DFLT_RULES@|$(XKB_DFLT_RULES)|g' \
+		-e 's|@XKB_DFLT_MODEL@|$(XKB_DFLT_MODEL)|g' \
+		-e 's|@XKB_DFLT_LAYOUT@|$(XKB_DFLT_LAYOUT)|g' \
+		-e 's|@XKB_DFLT_VARIANT@|$(XKB_DFLT_VARIANT)|g' \
+		-e 's|@XKB_DFLT_OPTIONS@|$(XKB_DFLT_OPTIONS)|g' \
+		-e 's|@bundle_id_prefix@|$(BUNDLE_ID_PREFIX)|g' \
+		-e 's|@modulepath@|$(DEFAULT_MODULE_PATH)|g' \
+		-e 's|@suid_wrapper_dir@|$(SUID_WRAPPER_DIR)|g' \
+		-e 's|@default_font_path@|$(COMPILEDDEFAULTFONTPATH)|g' \
 		-e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'
 
 .man.$(APP_MAN_SUFFIX):