From df2ab84d6deb2ce139474c3b4810ed91066c8515 Mon Sep 17 00:00:00 2001 From: wwalker Date: Wed, 30 May 2007 13:00:45 +0000 Subject: [PATCH] Fix for bug 439436 to add pyatspi to the make install target git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@930 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 6 ++++++ Makefile.am | 2 +- configure.in | 5 +++++ pyatspi/Makefile.am | 5 +++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12e39a5..a1fdcb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-30 Willie Walker + + * configure.in, Makefile.am, pyatspi/Makefile.am: Fix for bug + 439436 to add pyatspi to autotools stuff so it gets installed as + part of a make install. + 2007-05-17 Li Yuan * test/Makefile.am: diff --git a/Makefile.am b/Makefile.am index d24ceac..770e46e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi test po +SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi pyatspi test po pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc diff --git a/configure.in b/configure.in index dfab738..525b8b6 100644 --- a/configure.in +++ b/configure.in @@ -45,6 +45,10 @@ AC_PROG_CC AC_PROG_INSTALL AC_ISC_POSIX +# Check for Python + +AM_PATH_PYTHON(2.4) + GNOME_COMMON_INIT GNOME_COMPILE_WARNINGS(maximum) @@ -236,6 +240,7 @@ login-helper/Makefile test/Makefile cspi/Makefile cspi/bonobo/Makefile +pyatspi/Makefile ]) echo "AT-SPI setup: diff --git a/pyatspi/Makefile.am b/pyatspi/Makefile.am index 8c6fb7a..ef4129f 100644 --- a/pyatspi/Makefile.am +++ b/pyatspi/Makefile.am @@ -1,8 +1,9 @@ -lsr_PYTHON = \ +pyatspi_PYTHON = \ __init__.py \ accessible.py \ constants.py \ event.py \ registry.py \ utils.py -lsrdir = $(pkgpythondir)/ + +pyatspidir=$(pyexecdir)/pyatspi -- 2.7.4