Merge branch 'master' of https://github.com/kentonv/capnproto

c++/Makefile.am

@@ -60,7 +60,7 @@ capnpc_middleman:
 
 $(capnpc_outputs): capnpc_middleman
 
-includecapnpdir = $(includedir)/capnproto
+includecapnpdir = $(includedir)/capnp
 includekjdir = $(includedir)/kj
 
 includekj_HEADERS =                                            \

doc/install.md

@@ -182,4 +182,4 @@ If setting up Ekam is too much work for you, you can also build with Automake.
        sudo make install
 
 This will install `libcapnproto.a` in `/usr/local/lib` and headers in
-`/usr/local/include/capnproto`.
+`/usr/local/include/capnp` and `/usr/local/include/kj`.