diff --git a/examples/ChangeLog b/examples/ChangeLog
index 10ba1365a..3e641087b 100644
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,14 @@
+2001-07-19  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
+
+	* box-dynamic-module/Makefile.am, box-dynamic/Makefile.am,
+	box-module/Makefile.am, box/Makefile.am: Use $(top_srcdir) to get
+	at GUILE_LOAD_PATH, and $(top_builddir) for the guile and
+	guile-config programs and for the link paths.  Add check.test to
+	EXTRA_DIST.
+
+	* box-dynamic-module/Makefile.am, box-dynamic/Makefile.am,
+	box-module/Makefile.am, box/Makefile.am: Add -L../../qt to LIBS.
+
 2001-07-19  Rob Browning  <rlb@defaultvalue.org>
 
 	* box-module/.cvsignore: add .deps
diff --git a/examples/box-dynamic-module/Makefile.am b/examples/box-dynamic-module/Makefile.am
index 3944f468e..7bbb7d9bb 100644
--- a/examples/box-dynamic-module/Makefile.am
+++ b/examples/box-dynamic-module/Makefile.am
@@ -21,10 +21,10 @@
 
 all: libbox-module
 
-EXTRA_DIST = README box.c box-module.scm box-mixed.scm
+EXTRA_DIST = README box.c box-module.scm box-mixed.scm check.test
 
 CFLAGS=-I../..
-LIBS=`GUILE_LOAD_PATH=../.. ../../libguile/guile -e main -s ../../guile-config/guile-config link` -L../../libguile
+LIBS=`GUILE_LOAD_PATH=$(top_srcdir) $(top_builddir)/libguile/guile -e main -s $(top_builddir)/guile-config/guile-config link` -L$(top_builddir)/libguile -L$(top_builddir)/qt
 
 TESTS = check.test
 
diff --git a/examples/box-dynamic/Makefile.am b/examples/box-dynamic/Makefile.am
index 639ef202d..ecafb6719 100644
--- a/examples/box-dynamic/Makefile.am
+++ b/examples/box-dynamic/Makefile.am
@@ -21,10 +21,10 @@
 
 all: libbox
 
-EXTRA_DIST = README box.c
+EXTRA_DIST = README box.c check.test
 
 CFLAGS=-I../..
-LIBS=`GUILE_LOAD_PATH=../.. ../../libguile/guile -e main -s ../../guile-config/guile-config link` -L../../libguile
+LIBS=`GUILE_LOAD_PATH=$(top_srcdir) $(top_builddir)/libguile/guile -e main -s $(top_builddir)/guile-config/guile-config link` -$(top_builddir)/libguile -L$(top_builddir)/qt
 
 TESTS = check.test
 
diff --git a/examples/box-module/Makefile.am b/examples/box-module/Makefile.am
index 01d567d38..292ecb3b5 100644
--- a/examples/box-module/Makefile.am
+++ b/examples/box-module/Makefile.am
@@ -23,7 +23,9 @@ noinst_PROGRAMS = box
 
 box_SOURCES = box.c
 
-EXTRA_DIST = README
+EXTRA_DIST = README check.test
 
 CFLAGS=-I../..
-LIBS=`GUILE_LOAD_PATH=../.. ../../libguile/guile -e main -s ../../guile-config/guile-config link` -L../../libguile
+LIBS=`GUILE_LOAD_PATH=$(top_srcdir) $(top_builddir)/libguile/guile -e main -s $(top_builddir)/guile-config/guile-config link` -L$(top_builddir)/libguile -L$(top_builddir)/qt
+
+TESTS = check.test
diff --git a/examples/box/Makefile.am b/examples/box/Makefile.am
index 8c6dae7a6..79b2348e7 100644
--- a/examples/box/Makefile.am
+++ b/examples/box/Makefile.am
@@ -23,9 +23,9 @@ noinst_PROGRAMS = box
 
 box_SOURCES = box.c
 
-EXTRA_DIST = README
+EXTRA_DIST = README check.test
 
 CFLAGS=-I../..
-LIBS=`GUILE_LOAD_PATH=../.. ../../libguile/guile -e main -s ../../guile-config/guile-config link` -L../../libguile
+LIBS=`GUILE_LOAD_PATH=$(top_srcdir) $(top_builddir)/libguile/guile -e main -s $(top_builddir)/guile-config/guile-config link` -L$(top_buildir)/libguile -L$(top_builddir)/qt
 
 TESTS = check.test