Un-break 'make distcheck' yet again. I guess someone somewhere understands
how autoconf/automake really work, but not me :-) What's the difference
between $(srcdir) and $(top_srcdir) (eg in coregrind/Makefile.am) ?
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2104 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index ea04730..c61486f 100644
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -37,7 +37,7 @@
pth_exit pth_mutexspeed pth_once \
vgprintf
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -O0
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -O0 -I$(top_srcdir)/include
AM_CXXFLAGS = $(AM_CFLAGS)
# C ones
diff --git a/corecheck/tests/vgprintf.c b/corecheck/tests/vgprintf.c
index 7609143..0a023fb 100644
--- a/corecheck/tests/vgprintf.c
+++ b/corecheck/tests/vgprintf.c
@@ -1,4 +1,4 @@
-#include <include/valgrind.h>
+#include "valgrind.h"
#include <stdio.h>
int
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index c86c6a3..4f5a6fc 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -6,7 +6,7 @@
AM_CPPFLAGS = $(add_includes) -DVG_LIBDIR="\"$(libdir)"\"
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \
@PREFERRED_STACK_BOUNDARY@ -g -fpic
-AM_CCASFLAGS = $(add_includes)
+AM_CCASFLAGS = $(add_includes) -I..
valdir = $(libdir)/valgrind
diff --git a/coregrind/vg_startup.S b/coregrind/vg_startup.S
index 5e5d8a7..d8bc4da 100644
--- a/coregrind/vg_startup.S
+++ b/coregrind/vg_startup.S
@@ -30,7 +30,7 @@
*/
#include "vg_constants.h"
-#include "../config.h"
+#include "config.h"
#---------------------------------------------------------------------