diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-06 14:26:21 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-06 14:26:21 +0100 |
| commit | 050bf4a893e24061c3de35eb24c05d3d1002ed28 (patch) | |
| tree | 33033f0f8306c04f1cf122a90015bce6ba9bb7ba /test | |
| parent | 33773b778911c890d76c38b13f0fdb39df237d9e (diff) | |
| download | dbus-python-050bf4a893e24061c3de35eb24c05d3d1002ed28.tar.gz | |
Makefile.am, test/Makefile.am: Use @abs_top_builddir@, @abs_top_srcdir@
This fixes incorrect Python path for docs and tests if doing an out-of-tree
build using an absolute path for $(srcdir), and is also less ugly.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
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 |