From b09602535778a109ad246b45ab5766608239b2d9 Mon Sep 17 00:00:00 2001
From: Willie Walker <william.walker@sun.com>
Date: Wed, 6 Jan 2010 13:46:16 -0500
Subject: [PATCH] Move decision to use CORBA vs. D-Bus into D-Bus's pyatspi module.
Install to Python bindings into the Python pyatspi_corba module by
default, but use --disable-relocate to install into the Python
pyatspi module.
---
configure.in | 1 -
pyatspi/Makefile.am | 10 +---------
pyatspi/pyatspi-corba.pth.in | 1 -
3 files changed, 1 insertions(+), 11 deletions(-)
delete mode 100644 pyatspi/pyatspi-corba.pth.in
diff --git a/configure.in b/configure.in
index cf7371f..c557465 100644
--- a/configure.in
+++ b/configure.in
@@ -272,7 +272,6 @@ cspi/Makefile
cspi/bonobo/Makefile
pyatspi/Makefile
pyatspi/__init__.py
-pyatspi/pyatspi-corba.pth
])
echo "AT-SPI setup:
diff --git a/pyatspi/Makefile.am b/pyatspi/Makefile.am
index 5c3abdb..0c13d0b 100644
--- a/pyatspi/Makefile.am
+++ b/pyatspi/Makefile.am
@@ -7,15 +7,7 @@ pyatspi_PYTHON = \
utils.py
if RELOCATE
- pyatspidir=$(pyexecdir)/pyatspi-corba/pyatspi
+ pyatspidir=$(pyexecdir)/pyatspi_corba
else
pyatspidir=$(pyexecdir)/pyatspi
endif
-
-if RELOCATE
-install-exec-local:
- @$(MKDIR_P) $(DESTDIR)$(pyexecdir)
- cp pyatspi-corba.pth $(DESTDIR)$(pyexecdir)
-uninstall-local:
- @rm $(DESTDIR)$(pyexecdir)/pyatspi-corba.pth
-endif
diff --git a/pyatspi/pyatspi-corba.pth.in b/pyatspi/pyatspi-corba.pth.in
deleted file mode 100644
index e816e6a..0000000
--- a/pyatspi/pyatspi-corba.pth.in
+++ /dev/null
@@ -1 +0,0 @@
-import commands, sys; a = commands.getoutput('gconftool-2 --get /desktop/gnome/interface/at-spi-corba'); (a == 'true') and sys.path.insert(0, '@prefix@/lib/python@PYTHON_VERSION@/site-packages/pyatspi-corba')
--
1.5.6.5