[pyatspi2] Additional work on bgo#606251 - Handle CORBA vs. D-Bus choice better This removes the *.pth hack fro

[William Walker <wwalker src gnome org>]

commit fac662070aadca9066558f6ebb98b32161a9fc66
Author: Willie Walker <william walker sun com>
Date:   Fri Jan 8 15:53:01 2010 -0500

    Additional work on bgo#606251 - Handle CORBA vs. D-Bus choice better
    This removes the *.pth hack from the D-Bus side of the house if D-Bus is relocated.

 configure.ac                 |    1 -
 pyatspi/Makefile.am          |   11 +----------
 pyatspi/busutils/Makefile.am |    2 +-
 pyatspi/pyatspi-dbus.pth.in  |    1 -
 4 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c018862..4579d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,6 @@ AC_CONFIG_FILES([Makefile
 		 tests/apps/Makefile
 		 pyatspi/Makefile
 		 pyatspi/busutils/Makefile
-		 pyatspi/pyatspi-dbus.pth
 		])
 
 AC_OUTPUT
diff --git a/pyatspi/Makefile.am b/pyatspi/Makefile.am
index 3f7f142..e613893 100644
--- a/pyatspi/Makefile.am
+++ b/pyatspi/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=busutils
 if RELOCATE
-pyatspidir = $(pythondir)/pyatspi-dbus/pyatspi
+pyatspidir = $(pythondir)/pyatspi_dbus
 else
 pyatspidir = $(pythondir)/pyatspi
 endif
@@ -37,13 +37,4 @@ pyatspi_PYTHON = \
 		utils.py		\
 		value.py		
 
-if RELOCATE
-install-exec-local: Makefile
-	@$(MKDIR_P) $(DESTDIR)$(pyexecdir)
-	cp pyatspi-dbus.pth $(DESTDIR)$(pyexecdir)
-
-uninstall-local:
-	@rm $(DESTDIR)$(pyexecdir)/pyatspi-dbus.pth
-endif
-
 CLEANFILES = *.pyc
diff --git a/pyatspi/busutils/Makefile.am b/pyatspi/busutils/Makefile.am
index 3ab8c3a..f396281 100644
--- a/pyatspi/busutils/Makefile.am
+++ b/pyatspi/busutils/Makefile.am
@@ -1,5 +1,5 @@
 if RELOCATE
-pyatspidir = $(pythondir)/pyatspi-dbus/pyatspi
+pyatspidir = $(pythondir)/pyatspi_dbus
 else
 pyatspidir = $(pythondir)/pyatspi
 endif