xserver: Branch 'master'

[Adam Jackson]

 manpages.am |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 64b3227374f7f161e610df735f376fcc5bb0fd58
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 27 10:47:05 2018 -0400

    autotools: Fix excessive \-escaping that broke the build
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/manpages.am b/manpages.am
index 3ef3f08a6..8a36b0c1c 100644
--- a/manpages.am
+++ b/manpages.am
@@ -19,18 +19,18 @@ 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)\"|' \
+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'
+                -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