3 files changed, 6 insertions, 6 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 3d5bf55..376bd2a 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -4,7 +4,7 @@
 ##                    All rights reserved.
 ##
 ##
-top_srcdir=@top_srcdir@
+top_srcdir=@top_srcdir@/..
 top_builddir=../..
 srcdir=@srcdir@
 @COMMENCE@
@@ -14,7 +14,7 @@ hdf5_builddir=$(top_builddir)/src
 ## Add include directory to the C++ preprocessor flags and the hdf5
 ## library to the library list.
 LIB=../src/libhdf5_cpp.la
-CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/../src @CPPFLAGS@
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 LIBHDF5=$(hdf5_builddir)/libhdf5.la
 
 ## List all source files here. The list of object files will be
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 77e67aa..d978f21 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -4,12 +4,12 @@
 ## Copyright (C) 2000 National Center for Supercomputing Applications.
 ##		      All rights reserved.
 ##
-top_srcdir=@top_srcdir@
+top_srcdir=@top_srcdir@/..
 top_builddir=../..
 srcdir=@srcdir@
 @COMMENCE@
 
-hdf5_srcdir=$(top_srcdir)/../src
+hdf5_srcdir=$(top_srcdir)/src
 hdf5_builddir=$(top_builddir)/src
 
 TRACE=perl $(top_srcdir)/bin/trace
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index c1ee0dc..de75fbe 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -4,7 +4,7 @@
 ##                    All rights reserved.
 ##
 ##
-top_srcdir=@top_srcdir@
+top_srcdir=@top_srcdir@/..
 top_builddir=../..
 srcdir=@srcdir@
 @COMMENCE@
@@ -15,7 +15,7 @@ hdf5_builddir=$(top_builddir)/src
 ## libraries to the library list.
 LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir)
 LIB=../src/libhdf5_cpp.la
-CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/../src @CPPFLAGS@
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 HDF5LIB=$(hdf5_builddir)/libhdf5.la
 
 TEST_PROGS_SRC=