diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 6d062cfbd..93534b059 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -27,7 +27,7 @@
 #######################################################################
 # Variables
 #######################################################################
-SWIG       = $(top_builddir)preinst-swig
+SWIG       = $(top_builddir)/preinst-swig
 SWIG_LIB   = $(top_srcdir)/Lib
 TEST_SUITE = test-suite
 EXAMPLES   = Examples
diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index 9ad00e245..c57467601 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -10,7 +10,7 @@ CSHARPPATHSEPARATOR = "@CSHARPPATHSEPARATOR@"
 CSHARPCYGPATH_W     = @CSHARPCYGPATH_W@
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@../
+top_builddir = @top_builddir@/..
 
 CPP_TEST_CASES = \
 	csharp_attributes \
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index 9a55aa918..7c0a375a7 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -7,7 +7,7 @@ LANGUAGE     = java
 SCRIPTSUFFIX = _runme.java
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@../
+top_builddir = @top_builddir@/..
 
 C_TEST_CASES = \
 	java_lib_arrays \
diff --git a/Makefile.in b/Makefile.in
index 3ba374537..27037266c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,6 +5,7 @@
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 srcdir      = @srcdir@
+datarootdir = @datarootdir@
 
 ##############################################################################
 # Compiler and system configuration