### First section of patch: original 'CVS' files
#Output of diff -Nru dbus-0.60/Doxyfile.in{-old,}
--- dbus-0.60/Doxyfile.in-old	2004-06-02 14:13:14.000000000 +0100
+++ dbus-0.60/Doxyfile.in	2006-02-08 17:59:55.000000000 +0000
@@ -49,7 +49,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = dbus glib
+INPUT                  = @top_srcdir@/dbus @top_srcdir@/glib
 FILE_PATTERNS          = *.c *.h
 RECURSIVE              = YES
 #EXCLUDE                = test

#Output of diff -Nru dbus-0.60/gcj/org/freedesktop/dbus/Makefile.am{-old,}
--- dbus-0.60/gcj/org/freedesktop/dbus/Makefile.am-old	2005-09-06 23:38:54.000000000 +0100
+++ dbus-0.60/gcj/org/freedesktop/dbus/Makefile.am	2006-02-24 18:16:57.000000000 +0000
@@ -1,4 +1,5 @@
 INCLUDES=						\
+	-I$(top_builddir)	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gcj/org/freedesktop/dbus	\
 	 $(DBUS_CLIENT_CFLAGS) 

#Output of diff -Nru dbus-0.60/python/Makefile.am{-old,}
--- dbus-0.60/python/Makefile.am-old	2005-10-05 21:43:46.000000000 +0100
+++ dbus-0.60/python/Makefile.am	2006-02-24 19:09:08.000000000 +0000
@@ -46,7 +46,7 @@
 
 
 dbus_bindings.pxd: $(srcdir)/dbus_bindings.pxd.in $(srcdir)/extract.py
-	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(srcdir)/$(top_builddir)  -I$(srcdir) > $@.tmp && mv $@.tmp $@
+	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(top_builddir)  -I$(srcdir) > $@.tmp && mv $@.tmp $@
 
 dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd 
 	pyrexc $(srcdir)/dbus_bindings.pyx -I. -o ./dbus_bindings.c

#Output of diff -Nru dbus-0.60/test/glib/run-test.sh{-old,}
--- dbus-0.60/test/glib/run-test.sh-old	2005-03-17 17:48:29.000000000 +0000
+++ dbus-0.60/test/glib/run-test.sh	2006-02-24 19:34:01.000000000 +0000
@@ -10,7 +10,7 @@
 if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
   DBUS_TEST_GLIB_IN_RUN_TEST=1
   export DBUS_TEST_GLIB_IN_RUN_TEST
-  exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
 fi  
 
 if test x$MODE = xprofile ; then

#Output of diff -Nru dbus-0.60/test/name-test/run-test.sh{-old,}
--- dbus-0.60/test/name-test/run-test.sh-old	2005-11-22 20:37:00.000000000 +0000
+++ dbus-0.60/test/name-test/run-test.sh	2006-02-24 19:51:17.000000000 +0000
@@ -24,7 +24,7 @@
 if test -z "$DBUS_TEST_NAME_IN_RUN_TEST"; then
   DBUS_TEST_NAME_IN_RUN_TEST=1
   export DBUS_TEST_NAME_IN_RUN_TEST
-  exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
 fi 
 echo "running test-names"
 libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || die "test-client failed"

#Output of diff -Nru dbus-0.60/test/python/Makefile.am{-old,}
--- dbus-0.60/test/python/Makefile.am-old	2005-08-25 01:20:41.000000000 +0100
+++ dbus-0.60/test/python/Makefile.am	2006-02-24 22:58:24.000000000 +0000
@@ -2,7 +2,7 @@
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 TESTS=run-test.sh
 else
 TESTS=

#Output of diff -Nru dbus-0.60/test/glib/Makefile.am{-old,}
--- dbus-0.60/test/glib/Makefile.am-old	2005-08-23 20:48:30.000000000 +0100
+++ dbus-0.60/test/glib/Makefile.am	2006-02-25 11:25:28.000000000 +0000
@@ -4,7 +4,7 @@
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 TESTS=run-test.sh
 else
 TESTS=

#Output of diff -Nru dbus-0.60/test/name-test/Makefile.am{-old,}
--- dbus-0.60/test/name-test/Makefile.am-old	2005-11-22 20:37:00.000000000 +0000
+++ dbus-0.60/test/name-test/Makefile.am	2006-02-24 22:57:14.000000000 +0000
@@ -4,7 +4,7 @@
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 TESTS=run-test.sh
 else
 TESTS=

#Output of diff -Nru dbus-0.60/configure.in{-old,}
--- dbus-0.60/configure.in-old	2005-11-22 20:42:49.000000000 +0000
+++ dbus-0.60/configure.in	2006-02-24 22:55:57.000000000 +0000
@@ -1225,11 +1225,9 @@
 AC_SUBST(DBUS_USER)
 AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon])
 
-#### Tell tests where to find certain stuff in builddir
-ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
-
+DBUS_PWD=`pwd`
 AC_DEFUN(TEST_PATH, [
-TEST_$1=${ABSOLUTE_TOP_BUILDDIR}/test/$2
+TEST_$1=${DBUS_PWD}/test/$2
 AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1",
                    [Full path to test file test/$2 in builddir])
 AC_SUBST(TEST_$1)
@@ -1243,7 +1240,6 @@
 TEST_PATH(EXIT_BINARY, test-exit)
 TEST_PATH(SEGFAULT_BINARY, test-segfault)
 TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
-AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
 
 #### Find socket directories
 if ! test -z "$TMPDIR" ; then

### Second section of patch: configure (created by autoconf from configure.in)
#Output of diff -Nru dbus-0.60/configure{-old,}
--- dbus-0.60/configure-old	2005-11-30 21:02:26.000000000 +0000
+++ dbus-0.60/configure	2006-02-24 23:01:53.000000000 +0000
@@ -465,7 +465,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE DBUS_USE_GCJ_TRUE DBUS_USE_GCJ_FALSE LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MONO_REQUIRED_VERSION PKG_CONFIG MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC GACUTIL LIB_PREFIX LIB_SUFFIX DBUS_USE_CSC_TRUE DBUS_USE_CSC_FALSE MONODOC_REQUIRED_VERSION MONODOC_DEPENDENCY_CFLAGS MONODOC_DEPENDENCY_LIBS MONODOC ENABLE_MONODOC_TRUE ENABLE_MONODOC_FALSE DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS DBUS_GLIB_THREADS_CFLAGS DBUS_GLIB_THREADS_LIBS HAVE_GLIB_TRUE HAVE_GLIB_FALSE HAVE_GLIB_THREADS_TRUE HAVE_GLIB_THREADS_FALSE GLIB_GENMARSHAL DBUS_GLIB_TOOL_CFLAGS DBUS_GLIB_TOOL_LIBS DBUS_GTK_CFLAGS DBUS_GTK_LIBS DBUS_GTK_THREADS_CFLAGS DBUS_GTK_THREADS_LIBS HAVE_GTK_TRUE HAVE_GTK_FALSE QT3_MOC HAVE_QT3_TRUE HAVE_QT3_FALSE DBUS_QT3_CXXFLAGS DBUS_QT3_LIBS DBUS_QT_CFLAGS DBUS_QT_LIBS HAVE_QT_TRUE HAVE_QT_FALSE QT_MOC DBUS_QTESTLIB_CFLAGS DBUS_QTESTLIB_LIBS HAVE_QTESTLIB_TRUE HAVE_QTESTLIB_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_USER TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_GLIB_SERVICE_BINARY TEST_PYTHON_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY ABSOLUTE_TOP_BUILDDIR TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYREX PYTHON_INCLUDES HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE DBUS_USE_GCJ_TRUE DBUS_USE_GCJ_FALSE LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MONO_REQUIRED_VERSION PKG_CONFIG MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC GACUTIL LIB_PREFIX LIB_SUFFIX DBUS_USE_CSC_TRUE DBUS_USE_CSC_FALSE MONODOC_REQUIRED_VERSION MONODOC_DEPENDENCY_CFLAGS MONODOC_DEPENDENCY_LIBS MONODOC ENABLE_MONODOC_TRUE ENABLE_MONODOC_FALSE DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS DBUS_GLIB_THREADS_CFLAGS DBUS_GLIB_THREADS_LIBS HAVE_GLIB_TRUE HAVE_GLIB_FALSE HAVE_GLIB_THREADS_TRUE HAVE_GLIB_THREADS_FALSE GLIB_GENMARSHAL DBUS_GLIB_TOOL_CFLAGS DBUS_GLIB_TOOL_LIBS DBUS_GTK_CFLAGS DBUS_GTK_LIBS DBUS_GTK_THREADS_CFLAGS DBUS_GTK_THREADS_LIBS HAVE_GTK_TRUE HAVE_GTK_FALSE QT3_MOC HAVE_QT3_TRUE HAVE_QT3_FALSE DBUS_QT3_CXXFLAGS DBUS_QT3_LIBS DBUS_QT_CFLAGS DBUS_QT_LIBS HAVE_QT_TRUE HAVE_QT_FALSE QT_MOC DBUS_QTESTLIB_CFLAGS DBUS_QTESTLIB_LIBS HAVE_QTESTLIB_TRUE HAVE_QTESTLIB_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_USER TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_GLIB_SERVICE_BINARY TEST_PYTHON_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYREX PYTHON_INCLUDES HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -30826,13 +30826,8 @@
 _ACEOF
 
 
-#### Tell tests where to find certain stuff in builddir
-ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
-
-
-
-
+DBUS_PWD=`pwd`
-TEST_SERVICE_DIR=${ABSOLUTE_TOP_BUILDDIR}/test/data/valid-service-files
+TEST_SERVICE_DIR=${DBUS_PWD}/test/data/valid-service-files
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_SERVICE_DIR "$TEST_SERVICE_DIR"
@@ -30841,7 +30835,7 @@
 
 
 
-TEST_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-service
+TEST_SERVICE_BINARY=${DBUS_PWD}/test/test-service
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_SERVICE_BINARY "$TEST_SERVICE_BINARY"
@@ -30850,7 +30844,7 @@
 
 
 
-TEST_SHELL_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-shell-service
+TEST_SHELL_SERVICE_BINARY=${DBUS_PWD}/test/test-shell-service
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_SHELL_SERVICE_BINARY "$TEST_SHELL_SERVICE_BINARY"
@@ -30859,7 +30853,7 @@
 
 
 
-TEST_GLIB_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/glib/test-service-glib
+TEST_GLIB_SERVICE_BINARY=${DBUS_PWD}/test/glib/test-service-glib
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_GLIB_SERVICE_BINARY "$TEST_GLIB_SERVICE_BINARY"
@@ -30868,7 +30862,7 @@
 
 
 
-TEST_PYTHON_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/python/test-service.py
+TEST_PYTHON_SERVICE_BINARY=${DBUS_PWD}/test/python/test-service.py
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_PYTHON_SERVICE_BINARY "$TEST_PYTHON_SERVICE_BINARY"
@@ -30877,7 +30871,7 @@
 
 
 
-TEST_EXIT_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-exit
+TEST_EXIT_BINARY=${DBUS_PWD}/test/test-exit
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_EXIT_BINARY "$TEST_EXIT_BINARY"
@@ -30886,7 +30880,7 @@
 
 
 
-TEST_SEGFAULT_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-segfault
+TEST_SEGFAULT_BINARY=${DBUS_PWD}/test/test-segfault
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_SEGFAULT_BINARY "$TEST_SEGFAULT_BINARY"
@@ -30895,7 +30889,7 @@
 
 
 
-TEST_SLEEP_FOREVER_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-sleep-forever
+TEST_SLEEP_FOREVER_BINARY=${DBUS_PWD}/test/test-sleep-forever
 
 cat >>confdefs.h <<_ACEOF
 #define TEST_SLEEP_FOREVER_BINARY "$TEST_SLEEP_FOREVER_BINARY"
@@ -32279,7 +32273,6 @@
 s,@TEST_EXIT_BINARY@,$TEST_EXIT_BINARY,;t t
 s,@TEST_SEGFAULT_BINARY@,$TEST_SEGFAULT_BINARY,;t t
 s,@TEST_SLEEP_FOREVER_BINARY@,$TEST_SLEEP_FOREVER_BINARY,;t t
-s,@ABSOLUTE_TOP_BUILDDIR@,$ABSOLUTE_TOP_BUILDDIR,;t t
 s,@TEST_SOCKET_DIR@,$TEST_SOCKET_DIR,;t t
 s,@DBUS_SESSION_SOCKET_DIR@,$DBUS_SESSION_SOCKET_DIR,;t t
 s,@PYTHON@,$PYTHON,;t t

### Third section of patch: Makefile.in (created by automake from Makefile.am)
#Output of diff -Nru dbus-0.60/gcj/org/freedesktop/dbus/Makefile.in{-old,}
--- dbus-0.60/gcj/org/freedesktop/dbus/Makefile.in-old	2005-11-30 21:02:19.000000000 +0000
+++ dbus-0.60/gcj/org/freedesktop/dbus/Makefile.in	2006-02-24 18:17:30.000000000 +0000
@@ -339,6 +339,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = \
+	-I$(top_builddir)	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir)/gcj/org/freedesktop/dbus	\
 	 $(DBUS_CLIENT_CFLAGS) 

#Output of diff -Nru dbus-0.60/python/Makefile.in{-old,}
--- dbus-0.60/python/Makefile.in-old	2005-11-30 21:02:21.000000000 +0000
+++ dbus-0.60/python/Makefile.in	2006-02-24 19:09:25.000000000 +0000
@@ -836,7 +836,7 @@
 
 
 dbus_bindings.pxd: $(srcdir)/dbus_bindings.pxd.in $(srcdir)/extract.py
-	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(srcdir)/$(top_builddir)  -I$(srcdir) > $@.tmp && mv $@.tmp $@
+	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(top_builddir)  -I$(srcdir) > $@.tmp && mv $@.tmp $@
 
 dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd 
 	pyrexc $(srcdir)/dbus_bindings.pyx -I. -o ./dbus_bindings.c

#Output of diff -Nru dbus-0.60/mono/example/Makefile.in{-old,}
--- dbus-0.60/mono/example/Makefile.in-old	2005-11-30 21:02:21.000000000 +0000
+++ dbus-0.60/mono/example/Makefile.in	2006-02-24 23:02:09.000000000 +0000
@@ -49,7 +49,6 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/mono/doc/Makefile.in{-old,}
--- dbus-0.60/mono/doc/Makefile.in-old	2005-11-30 21:02:20.000000000 +0000
+++ dbus-0.60/mono/doc/Makefile.in	2006-02-24 23:01:59.000000000 +0000
@@ -52,7 +52,6 @@
 DIST_SOURCES =
 DATA = $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/mono/Makefile.in{-old,}
--- dbus-0.60/mono/Makefile.in-old	2005-11-30 21:02:20.000000000 +0000
+++ dbus-0.60/mono/Makefile.in	2006-02-24 23:02:03.000000000 +0000
@@ -60,7 +60,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/gcj/org/freedesktop/dbus/Makefile.in{-old,}
--- dbus-0.60/gcj/org/freedesktop/dbus/Makefile.in-old	2005-11-30 21:02:19.000000000 +0000
+++ dbus-0.60/gcj/org/freedesktop/dbus/Makefile.in	2006-02-24 22:58:50.000000000 +0000
@@ -86,7 +86,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/gcj/org/freedesktop/Makefile.in{-old,}
--- dbus-0.60/gcj/org/freedesktop/Makefile.in-old	2005-11-30 21:02:18.000000000 +0000
+++ dbus-0.60/gcj/org/freedesktop/Makefile.in	2006-02-24 22:58:54.000000000 +0000
@@ -58,7 +58,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/gcj/org/Makefile.in{-old,}
--- dbus-0.60/gcj/org/Makefile.in-old	2005-11-30 21:02:18.000000000 +0000
+++ dbus-0.60/gcj/org/Makefile.in	2006-02-24 22:59:01.000000000 +0000
@@ -58,7 +58,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/gcj/Makefile.in{-old,}
--- dbus-0.60/gcj/Makefile.in-old	2005-11-30 21:02:18.000000000 +0000
+++ dbus-0.60/gcj/Makefile.in	2006-02-24 22:59:06.000000000 +0000
@@ -84,7 +84,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/python/examples/Makefile.in{-old,}
--- dbus-0.60/python/examples/Makefile.in-old	2005-11-30 21:02:21.000000000 +0000
+++ dbus-0.60/python/examples/Makefile.in	2006-02-24 22:58:34.000000000 +0000
@@ -49,7 +49,6 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/python/Makefile.in{-old,}
--- dbus-0.60/python/Makefile.in-old	2005-11-30 21:02:21.000000000 +0000
+++ dbus-0.60/python/Makefile.in	2006-02-24 22:58:38.000000000 +0000
@@ -95,7 +95,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/test/python/Makefile.in{-old,}
--- dbus-0.60/test/python/Makefile.in-old	2005-11-30 21:02:23.000000000 +0000
+++ dbus-0.60/test/python/Makefile.in	2006-02-24 22:58:21.000000000 +0000
@@ -49,7 +49,6 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
@@ -301,7 +300,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 @DBUS_BUILD_TESTS_FALSE@TESTS = 
 @DBUS_BUILD_TESTS_TRUE@TESTS = run-test.sh
 EXTRA_DIST = run-test.sh test-service.py test-client.py

#Output of diff -Nru dbus-0.60/test/qt/Makefile.in{-old,}
--- dbus-0.60/test/qt/Makefile.in-old	2005-11-30 23:48:27.000000000 +0000
+++ dbus-0.60/test/qt/Makefile.in	2006-02-24 22:57:56.000000000 +0000
@@ -72,7 +72,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/test/glib/Makefile.in{-old,}
--- dbus-0.60/test/glib/Makefile.in-old	2005-11-30 21:02:23.000000000 +0000
+++ dbus-0.60/test/glib/Makefile.in	2006-02-24 22:57:36.000000000 +0000
@@ -115,7 +115,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
@@ -368,7 +367,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION
-@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 @DBUS_BUILD_TESTS_FALSE@TESTS = 
 @DBUS_BUILD_TESTS_TRUE@TESTS = run-test.sh
 EXTRA_DIST = run-test.sh test-service-glib.xml my-object-marshal.list test-service-glib.xml

#Output of diff -Nru dbus-0.60/test/name-test/Makefile.in{-old,}
--- dbus-0.60/test/name-test/Makefile.in-old	2005-11-30 21:02:23.000000000 +0000
+++ dbus-0.60/test/name-test/Makefile.in	2006-02-24 22:56:47.000000000 +0000
@@ -71,7 +71,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
@@ -324,7 +323,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION
-@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 @DBUS_BUILD_TESTS_FALSE@TESTS = 
 @DBUS_BUILD_TESTS_TRUE@TESTS = run-test.sh
 EXTRA_DIST = run-test.sh 

#Output of diff -Nru dbus-0.60/test/Makefile.in{-old,}
--- dbus-0.60/test/Makefile.in-old	2005-11-30 21:02:22.000000000 +0000
+++ dbus-0.60/test/Makefile.in	2006-02-24 22:58:30.000000000 +0000
@@ -118,7 +118,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/dbus/Makefile.in{-old,}
--- dbus-0.60/dbus/Makefile.in-old	2005-11-30 21:02:17.000000000 +0000
+++ dbus-0.60/dbus/Makefile.in	2006-02-24 22:56:18.000000000 +0000
@@ -121,7 +121,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/bus/Makefile.in{-old,}
--- dbus-0.60/bus/Makefile.in-old	2005-11-30 21:02:17.000000000 +0000
+++ dbus-0.60/bus/Makefile.in	2006-02-24 22:56:14.000000000 +0000
@@ -121,7 +121,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/qt/Makefile.in{-old,}
--- dbus-0.60/qt/Makefile.in-old	2005-11-30 21:02:22.000000000 +0000
+++ dbus-0.60/qt/Makefile.in	2006-02-24 22:56:08.000000000 +0000
@@ -108,7 +108,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/qt3/Makefile.in{-old,}
--- dbus-0.60/qt3/Makefile.in-old	2005-11-30 21:02:22.000000000 +0000
+++ dbus-0.60/qt3/Makefile.in	2006-02-24 22:56:03.000000000 +0000
@@ -98,7 +98,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/glib/examples/statemachine/Makefile.in{-old,}
--- dbus-0.60/glib/examples/statemachine/Makefile.in-old	2005-11-30 21:02:20.000000000 +0000
+++ dbus-0.60/glib/examples/statemachine/Makefile.in	2006-02-24 22:54:40.000000000 +0000
@@ -80,7 +80,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/glib/examples/Makefile.in{-old,}
--- dbus-0.60/glib/examples/Makefile.in-old	2005-11-30 21:02:20.000000000 +0000
+++ dbus-0.60/glib/examples/Makefile.in	2006-02-24 22:54:45.000000000 +0000
@@ -94,7 +94,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/glib/Makefile.in{-old,}
--- dbus-0.60/glib/Makefile.in-old	2005-11-30 21:02:19.000000000 +0000
+++ dbus-0.60/glib/Makefile.in	2006-02-24 22:54:49.000000000 +0000
@@ -117,7 +117,6 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/tools/Makefile.in{-old,}
--- dbus-0.60/tools/Makefile.in-old	2005-11-30 21:02:24.000000000 +0000
+++ dbus-0.60/tools/Makefile.in	2006-02-24 22:54:33.000000000 +0000
@@ -107,7 +107,6 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/doc/Makefile.in{-old,}
--- dbus-0.60/doc/Makefile.in-old	2005-11-30 21:02:18.000000000 +0000
+++ dbus-0.60/doc/Makefile.in	2006-02-24 22:54:19.000000000 +0000
@@ -50,7 +50,6 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@

#Output of diff -Nru dbus-0.60/Makefile.in{-old,}
--- dbus-0.60/Makefile.in-old	2005-11-30 21:02:25.000000000 +0000
+++ dbus-0.60/Makefile.in	2006-02-24 22:58:47.000000000 +0000
@@ -101,7 +101,6 @@
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@