Update libvtv to install header files in standard

location rather than top level include dir.

From-SVN: r202873

diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 9125287d898f0bcbef925c15bd460033a81caace..54aba4f62e35bb8bc31764d87e04dc00e0a40003 100644 (file)
--- 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 c3983effb7d88e3b81ee09d411df8f9254518c2e..61118988993592af9cc4616d0017ad8d708276cc 100644 (file)
--- 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 e021d42fd14d9d3b49384491d8df6bb38c8141ea..96e4a2206f9ffba0d32b46979c80c07a2e7b9e4d 100644 (file)
--- 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