summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libvtv/ChangeLog6
-rw-r--r--libvtv/Makefile.am2
-rw-r--r--libvtv/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 9125287d898..54aba4f62e3 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-24 Caroline Tice <cmtice@google.com>
+
+ * Makefile.am: Change libvtv_includedir to the directory used by
+ the other libraries rather than the top include directory.
+ * Makefile.in: Regenerated.
+
2013-09-20 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/libvtv/Makefile.am b/libvtv/Makefile.am
index c3983effb7d..61118988993 100644
--- a/libvtv/Makefile.am
+++ b/libvtv/Makefile.am
@@ -51,7 +51,7 @@ vtv_sources = \
vtv_utils.cc \
vtv_end.c
-libvtv_includedir = $(includedir)
+libvtv_includedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
# Link in vtv_start and vtv_end.
BUILT_SOURCES = vtv_start.c vtv_end.c
diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in
index e021d42fd14..96e4a2206f9 100644
--- a/libvtv/Makefile.in
+++ b/libvtv/Makefile.in
@@ -289,7 +289,7 @@ vtv_sources = \
vtv_utils.cc \
vtv_end.c
-libvtv_includedir = $(includedir)
+libvtv_includedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
# Link in vtv_start and vtv_end.
BUILT_SOURCES = vtv_start.c vtv_end.c