diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-06 14:34:44 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-06 14:34:44 +0100 |
| commit | 82be7b7925d36addc5464277bbb750b0c7335e5d (patch) | |
| tree | 4cf0a3fb1e5ac7aa5dcf92f31240fb648acf99d3 | |
| parent | 1eeab98392221ac3c57d94b5a8c98b89a1dd2382 (diff) | |
| parent | 7028d177352b18efa3cc567f6753e1dbdab8f025 (diff) | |
| download | dbus-python-82be7b7925d36addc5464277bbb750b0c7335e5d.tar.gz | |
Merge branch 'master' into purity
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 10 |
3 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 5229270..a86521b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,6 @@ +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ + ACLOCAL_AMFLAGS = -I m4 # the api, doc, include subdirs don't need their own Makefile.am @@ -80,8 +83,7 @@ _dbus_bindings/_dbus_bindings.la: _dbus_glib_bindings/_dbus_glib_bindings.la: $(MAKE) -C _dbus_glib_bindings -PWD = `pwd` -APIDOC_PYTHONPATH = $(PWD)/$(top_srcdir):$(PWD)/_dbus_bindings/.libs:$(PWD)/_dbus_glib_bindings/.libs +APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs api api/index.html: $(python_PYTHON) dbus/.doc-needs-rebuild-stamp \ _dbus_bindings/_dbus_bindings.la \ @@ -17,6 +17,10 @@ Roadmap: D-Bus Python Bindings 0.82.3 (unreleased) ========================================= +Fixes: + +* Out-of-tree builds with an absolute $(srcdir) can now build docs and run tests + D-Bus Python Bindings 0.82.2 (2007-08-01) ========================================= diff --git a/test/Makefile.am b/test/Makefile.am index ef2d529..a40c3d1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,3 +1,6 @@ +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ + EXTRA_DIST = \ cross-test-client.py \ cross-test-server.py \ @@ -28,11 +31,10 @@ dbus_py_test_la_LDFLAGS = -module -avoid-version \ dbus_py_test_la_SOURCES = dbus_py_test.c \ $(top_srcdir)/include/dbus-python.h -PWD = `pwd` -TESTS_ENVIRONMENT = DBUS_TOP_SRCDIR="$(PWD)/$(top_srcdir)" \ - DBUS_TOP_BUILDDIR="$(PWD)/$(top_builddir)" \ +TESTS_ENVIRONMENT = DBUS_TOP_SRCDIR="$(abs_top_srcdir)" \ + DBUS_TOP_BUILDDIR="$(abs_top_builddir)" \ DBUS_PYTHON_VERSION='$(PACKAGE_VERSION)' \ - PYTHONPATH="$(PWD)/.libs:$(PWD)/$(top_srcdir):$(PWD)/$(top_srcdir)/test:$(PWD)/../_dbus_bindings/.libs:$(PWD)/../_dbus_glib_bindings/.libs" \ + PYTHONPATH="$(abs_top_builddir)/test/.libs:$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs" \ PYTHON='$(PYTHON)' TESTS = run-test.sh |