From 64b3227374f7f161e610df735f376fcc5bb0fd58 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 27 Mar 2018 10:47:05 -0400 Subject: [PATCH] autotools: Fix excessive \-escaping that broke the build Signed-off-by: Adam Jackson --- manpages.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manpages.am b/manpages.am index 3ef3f08a6f..8a36b0c1c0 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