Re: [PATCH xserver 02/12] man: s/__/@/g

[Adam Jackson]

On Tue, 2018-03-27 at 16:50 +0200, Olivier Fourdan wrote:
> Hi,
> 
> On Tue, Mar 27, 2018 at 12:42 AM, Adam Jackson  wrote:
> > 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.
> 
> [...]
> 
> Note sure if it's related but the builds fails here with: 
> 
> Making all in man
> make[1]: Entering directory 'xserver/man'
>   GEN  Xserver.1
> /usr/bin/sed: -e expression #18, char 18: unterminated `s' command
> make[1]: *** [Makefile:834: Xserver.1] Error 1
> make[1]: Leaving directory 'xserver/man'
> make: *** [Makefile:809: all-recursive] Error 1

It was. I somehow managed to build successfully across this change.
64b3227374f7f161e610df735f376fcc5bb0fd58 should fix it.

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 02/12] man: s/__/@/g

[Olivier Fourdan]

Hi,

On Tue, Mar 27, 2018 at 12:42 AM, Adam Jackson  wrote:

> 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.
>

[...]

Note sure if it's related but the builds fails here with:

Making all in man
make[1]: Entering directory 'xserver/man'
  GEN  Xserver.1
/usr/bin/sed: -e expression #18, char 18: unterminated `s' command
make[1]: *** [Makefile:834: Xserver.1] Error 1
make[1]: Leaving directory 'xserver/man'
make: *** [Makefile:809: all-recursive] Error 1

PS: I'm building with automate here, not meson.

Cheers,
Olivier
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 02/12] man: s/__/@/g

[Keith Packard]

Adam Jackson  writes:

> 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 

Reviewed-by: Keith Packard 

-- 
-keith


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 02/12] man: s/__/@/g

[Adam Jackson]

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 
---
 hw/dmx/config/man/dmxtodmx.man |   2 +-
 hw/dmx/config/man/vdltodmx.man |   2 +-
 hw/dmx/config/man/xdmxconfig.man   |   2 +-
 hw/dmx/man/Xdmx.man|  26 +--
 hw/kdrive/Xkdrive.man  |   4 +-
 hw/kdrive/ephyr/man/Xephyr.man |   6 +-
 hw/vfb/man/Xvfb.man|   4 +-
 hw/xfree86/drivers/modesetting/modesetting.man |  10 +-
 hw/xfree86/exa/man/exa.man |   6 +-
 hw/xfree86/fbdevhw/man/fbdevhw.man |  10 +-
 hw/xfree86/man/Xorg.man| 158 -
 hw/xfree86/man/Xorg.wrap.man   |  10 +-
 hw/xfree86/man/Xwrapper.config.man |   2 +-
 hw/xfree86/man/xorg.conf.d.man |   2 +-
 hw/xfree86/man/xorg.conf.man   | 232 -
 hw/xfree86/utils/man/cvt.man   |   6 +-
 hw/xfree86/utils/man/gtf.man   |   6 +-
 hw/xnest/man/Xnest.man |  22 +--
 hw/xquartz/man/Xquartz.man |  56 +++---
 hw/xwin/man/XWin.man   |  16 +-
 hw/xwin/man/XWinrc.man |   4 +-
 hw/xwin/winclipboard/xwinclip.man  |   2 +-
 man/Xserver.man|  28 +--
 manpages.am|  46 +++--
 24 files changed, 339 insertions(+), 323 deletions(-)

diff --git a/hw/dmx/config/man/dmxtodmx.man b/hw/dmx/config/man/dmxtodmx.man
index 68c7f5b40e..e939487554 100644
--- a/hw/dmx/config/man/dmxtodmx.man
+++ b/hw/dmx/config/man/dmxtodmx.man
@@ -26,7 +26,7 @@
 .\" Authors:
 .\"   Rickard E. (Rik) Faith 
 .\"
-.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 b733db7ab0..aa5b4244fe 100644
--- a/hw/dmx/config/man/vdltodmx.man
+++ b/hw/dmx/config/man/vdltodmx.man
@@ -26,7 +26,7 @@
 .\" Authors:
 .\"   Rickard E. (Rik) Faith 
 .\"
-.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 dcceea0e34..45b6b9bcc3 100644
--- a/hw/dmx/config/man/xdmxconfig.man
+++ b/hw/dmx/config/man/xdmxconfig.man
@@ -26,7 +26,7 @@
 .\" Authors:
 .\"   Rickard E. (Rik) Faith 
 .\"
-.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 4a25fdc667..ef62a02f50 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