Changed Makefiles so that the following files are installed:

  valgrind.h --> $prefix/include/valgrind/valgrind.h
  memcheck.h --> $prefix/include/valgrind/memcheck.h

This mirrors the lib/ structure.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1289

diff --git a/include/Makefile.am b/include/Makefile.am
index 2f9cdf5000127b0159cd2e97cdc3b5223993e1ff..114ae11f2f5d5565de9b223e9a2ca2341183d647 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,11 @@
 EXTRA_DIST = \
-       valgrind.h \
        vg_constants_skin.h \
        vg_profile.c \
        vg_skin.h
 
+incincdir = $(includedir)/valgrind
+
+incinc_HEADERS = \
+       valgrind.h
+
+

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 5744957ff331222c41e002fd83e9206c32f83db5..a37590248b2fcdc31b6a24b4649ca3db56ed4d16 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -21,10 +21,14 @@ vgskin_memcheck_so_SOURCES = \
        mc_helpers.S
 vgskin_memcheck_so_LDFLAGS = -shared
 
-noinst_HEADERS = \
-       mc_include.h    \
+mcincludedir = $(includedir)/valgrind
+
+mcinclude_HEADERS = \
        memcheck.h
 
+noinst_HEADERS = \
+       mc_include.h
+
 MANUAL_DEPS = $(noinst_HEADERS)
 
 ##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)