xserver: Branch 'master'

[Julien Cristau]

 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d143e7e41bdbf0378b733b2f2bb544ce1fe93519
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue Mar 27 23:07:13 2018 +0200

    Fix MAN_SUBSTS libdir replacements
    
    __libdir__ doesn't seem to actually be used anywhere in the man page,
    but...
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 8c1faf8..a58faca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,7 +209,7 @@ MAN_SUBSTS = \
         -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
         -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
         -e 's|__datadir__|$(datadir)|g' \
-        -e 's|__datadir__|$(libdir)|g' \
+        -e 's|__libdir__|$(libdir)|g' \
         -e 's|__sysconfdir__|$(sysconfdir)|g' \
         -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
         -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \