Move header files to $includedir/xcb (generally $prefix/include/xcb).

diff --git a/configure.ac b/configure.ac
index ff91834..afcdc8c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AC_HEADER_STDC
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(connect, socket)
 
-xcbincludedir='${includedir}/X11/XCB'
+xcbincludedir='${includedir}/xcb'
 AC_SUBST(xcbincludedir)
 
 AC_ARG_WITH(opt,

diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 2b0fa9f..7e26145 100755 (executable)
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -93,4 +93,5 @@ sub convert($$)
        return "xcb" . $_;
 }
 
+s/^(\s*#\s*include\s*<)X11\/XCB\//$1xcb\//;
 s/([_A-Za-z][_A-Za-z0-9]*)([ \t]*\()?/convert($1, defined $2) . ($2 or "")/eg;