Fix installation of includes.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6317 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/configure.in b/configure.in
index 74af7a8..f625a9e 100644
--- a/configure.in
+++ b/configure.in
@@ -891,6 +891,7 @@
perf/Makefile
perf/vg_perf
include/Makefile
+ include/vki/Makefile
auxprogs/Makefile
coregrind/Makefile
memcheck/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index ff430ae..4c854e6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,6 @@
+SUBDIRS = vki
+
incincdir = $(includedir)/valgrind
incinc_HEADERS = \
@@ -30,20 +32,4 @@
pub_tool_tooliface.h \
pub_tool_vki.h \
pub_tool_vkiscnums.h \
- valgrind.h \
- vki/vki-linux.h \
- vki/vki-posixtypes-amd64-linux.h \
- vki/vki-posixtypes-ppc32-linux.h \
- vki/vki-posixtypes-ppc64-linux.h \
- vki/vki-posixtypes-x86-linux.h \
- vki/vki-amd64-linux.h \
- vki/vki-ppc32-aix5.h \
- vki/vki-ppc64-aix5.h \
- vki/vki-ppc32-linux.h \
- vki/vki-ppc64-linux.h \
- vki/vki-x86-linux.h \
- vki/vki-scnums-amd64-linux.h \
- vki/vki-scnums-ppc32-linux.h \
- vki/vki-scnums-ppc64-linux.h \
- vki/vki-scnums-x86-linux.h \
- vki/vki-scnums-aix5.h
+ valgrind.h
diff --git a/include/vki/Makefile.am b/include/vki/Makefile.am
new file mode 100644
index 0000000..1d8dcc7
--- /dev/null
+++ b/include/vki/Makefile.am
@@ -0,0 +1,20 @@
+
+incincdir = $(includedir)/valgrind/vki
+
+incinc_HEADERS = \
+ vki-linux.h \
+ vki-posixtypes-amd64-linux.h \
+ vki-posixtypes-ppc32-linux.h \
+ vki-posixtypes-ppc64-linux.h \
+ vki-posixtypes-x86-linux.h \
+ vki-amd64-linux.h \
+ vki-ppc32-aix5.h \
+ vki-ppc64-aix5.h \
+ vki-ppc32-linux.h \
+ vki-ppc64-linux.h \
+ vki-x86-linux.h \
+ vki-scnums-amd64-linux.h \
+ vki-scnums-ppc32-linux.h \
+ vki-scnums-ppc64-linux.h \
+ vki-scnums-x86-linux.h \
+ vki-scnums-aix5.h