summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2006-09-25 04:03:01 -0700
committerJamey Sharp <jamey@minilop.net>2006-09-25 04:19:25 -0700
commit0bccf7d2eed45ba15a012d090b9b950075e75803 (patch)
tree1dc120ba422b6966e9220d59f8374f1061ab1fe7
parent9100981d359f6366ab92b456e6069bac89afeb15 (diff)
Move header files to $includedir/xcb (generally $prefix/include/xcb).
-rw-r--r--configure.ac2
-rwxr-xr-xtools/api_conv.pl1
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index ff91834..afcdc8c 100644
--- 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
--- 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;