[deskbar-applet] Reverted fix for bug #578803 – deskbar-applet incorrectly installs to pythondir rather than pyexec

[Sebastian Polsterl <sebp src gnome org>]

commit 3d10172ea1568c62827a75c2942e916b9983e421
Author: Sebastian Pölsterl <sebp k-d-w org>
Date:   Wed Aug 12 23:45:09 2009 +0200

    Reverted fix for bug #578803 â?? deskbar-applet incorrectly installs to pythondir rather than pyexecdir

 deskbar/core/_userdirs/Makefile.am     |    2 +-
 deskbar/core/keybinder/Makefile.am     |    2 +-
 deskbar/handlers/evolution/Makefile.am |    2 +-
 deskbar/osutils/Makefile.am            |    2 +-
 deskbar/ui/iconentry/Makefile.am       |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/deskbar/core/_userdirs/Makefile.am b/deskbar/core/_userdirs/Makefile.am
index b70e5df..5d03790 100644
--- a/deskbar/core/_userdirs/Makefile.am
+++ b/deskbar/core/_userdirs/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) $(GLIB_CFLAGS)
 
-__userdirsdir = $(pyexecdir)/deskbar/core/_userdirs
+__userdirsdir = $(pythondir)/deskbar/core/_userdirs
 __userdirs_LTLIBRARIES = __userdirs.la
 __userdirs_la_LDFLAGS = -module -avoid-version -export-symbols-regex init__userdirs
 __userdirs_la_LIBADD = $(DESKBAR_LIBS) $(GLIB_LIBS)
diff --git a/deskbar/core/keybinder/Makefile.am b/deskbar/core/keybinder/Makefile.am
index 4904dda..6249e7f 100644
--- a/deskbar/core/keybinder/Makefile.am
+++ b/deskbar/core/keybinder/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_keybinderdir = $(pyexecdir)/deskbar/core/keybinder
+_keybinderdir = $(pythondir)/deskbar/core/keybinder
 _keybinder_LTLIBRARIES = _keybinder.la
 _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder
 _keybinder_la_LIBADD = $(DESKBAR_LIBS)
diff --git a/deskbar/handlers/evolution/Makefile.am b/deskbar/handlers/evolution/Makefile.am
index b08def4..ad9c6d7 100644
--- a/deskbar/handlers/evolution/Makefile.am
+++ b/deskbar/handlers/evolution/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(EVOLUTION_CFLAGS)
 
-_evolutiondir = $(pyexecdir)/deskbar/handlers/evolution
+_evolutiondir = $(pythondir)/deskbar/handlers/evolution
 _evolution_LTLIBRARIES = _evolution.la
 _evolution_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_evolution
 _evolution_la_LIBADD = $(EVOLUTION_LIBS)
diff --git a/deskbar/osutils/Makefile.am b/deskbar/osutils/Makefile.am
index c7e8c12..e5a516c 100644
--- a/deskbar/osutils/Makefile.am
+++ b/deskbar/osutils/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_osutilsdir = $(pyexecdir)/deskbar/osutils
+_osutilsdir = $(pythondir)/deskbar/osutils
 _osutils_LTLIBRARIES = _osutils.la
 _osutils_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_osutils
 _osutils_la_LIBADD = $(DESKBAR_LIBS)
diff --git a/deskbar/ui/iconentry/Makefile.am b/deskbar/ui/iconentry/Makefile.am
index dde1b7b..dd3b020 100644
--- a/deskbar/ui/iconentry/Makefile.am
+++ b/deskbar/ui/iconentry/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_iconentrydir = $(pyexecdir)/deskbar/ui/iconentry
+_iconentrydir = $(pythondir)/deskbar/ui/iconentry
 _iconentry_LTLIBRARIES = _iconentry.la
 _iconentry_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_iconentry
 _iconentry_la_LIBADD = $(DESKBAR_LIBS)