Commit 8747ca9c authored by Kenton Varda's avatar Kenton Varda

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

parents 1b7211bc 0182074e
...@@ -60,7 +60,7 @@ capnpc_middleman: ...@@ -60,7 +60,7 @@ capnpc_middleman:
$(capnpc_outputs): capnpc_middleman $(capnpc_outputs): capnpc_middleman
includecapnpdir = $(includedir)/capnproto includecapnpdir = $(includedir)/capnp
includekjdir = $(includedir)/kj includekjdir = $(includedir)/kj
includekj_HEADERS = \ includekj_HEADERS = \
......
...@@ -182,4 +182,4 @@ If setting up Ekam is too much work for you, you can also build with Automake. ...@@ -182,4 +182,4 @@ If setting up Ekam is too much work for you, you can also build with Automake.
sudo make install sudo make install
This will install `libcapnproto.a` in `/usr/local/lib` and headers in 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`.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment