deskbar-applet r2636 - in trunk: . deskbar/core/_userdirs deskbar/core/keybinder deskbar/handlers/evolution deskbar/handlers/gdmclient deskbar/osutils deskbar/ui/iconentry

[sebp svn gnome org]

Author: sebp
Date: Mon Apr 13 09:50:09 2009
New Revision: 2636
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2636&view=rev

Log:
Fixed bug #578803: deskbar-applet incorrectly installs to pythondir rather than pyexecdir

Modified:
   trunk/ChangeLog
   trunk/deskbar/core/_userdirs/Makefile.am
   trunk/deskbar/core/keybinder/Makefile.am
   trunk/deskbar/handlers/evolution/Makefile.am
   trunk/deskbar/handlers/gdmclient/Makefile.am
   trunk/deskbar/osutils/Makefile.am
   trunk/deskbar/ui/iconentry/Makefile.am

Modified: trunk/deskbar/core/_userdirs/Makefile.am
==============================================================================
--- trunk/deskbar/core/_userdirs/Makefile.am	(original)
+++ trunk/deskbar/core/_userdirs/Makefile.am	Mon Apr 13 09:50:09 2009
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) $(GLIB_CFLAGS)
 
-__userdirsdir = $(pythondir)/deskbar/core/_userdirs
+__userdirsdir = $(pyexecdir)/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)

Modified: trunk/deskbar/core/keybinder/Makefile.am
==============================================================================
--- trunk/deskbar/core/keybinder/Makefile.am	(original)
+++ trunk/deskbar/core/keybinder/Makefile.am	Mon Apr 13 09:50:09 2009
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_keybinderdir = $(pythondir)/deskbar/core/keybinder
+_keybinderdir = $(pyexecdir)/deskbar/core/keybinder
 _keybinder_LTLIBRARIES = _keybinder.la
 _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder
 _keybinder_la_LIBADD = $(DESKBAR_LIBS)

Modified: trunk/deskbar/handlers/evolution/Makefile.am
==============================================================================
--- trunk/deskbar/handlers/evolution/Makefile.am	(original)
+++ trunk/deskbar/handlers/evolution/Makefile.am	Mon Apr 13 09:50:09 2009
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(EVOLUTION_CFLAGS)
 
-_evolutiondir = $(pythondir)/deskbar/handlers/evolution
+_evolutiondir = $(pyexecdir)/deskbar/handlers/evolution
 _evolution_LTLIBRARIES = _evolution.la
 _evolution_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_evolution
 _evolution_la_LIBADD = $(EVOLUTION_LIBS)

Modified: trunk/deskbar/handlers/gdmclient/Makefile.am
==============================================================================
--- trunk/deskbar/handlers/gdmclient/Makefile.am	(original)
+++ trunk/deskbar/handlers/gdmclient/Makefile.am	Mon Apr 13 09:50:09 2009
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_gdmclientdir = $(pythondir)/deskbar/handlers/gdmclient
+_gdmclientdir = $(pyexecdir)/deskbar/handlers/gdmclient
 _gdmclient_LTLIBRARIES = _gdmclient.la
 _gdmclient_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gdmclient
 _gdmclient_la_LIBADD = $(DESKBAR_LIBS)

Modified: trunk/deskbar/osutils/Makefile.am
==============================================================================
--- trunk/deskbar/osutils/Makefile.am	(original)
+++ trunk/deskbar/osutils/Makefile.am	Mon Apr 13 09:50:09 2009
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_osutilsdir = $(pythondir)/deskbar/osutils
+_osutilsdir = $(pyexecdir)/deskbar/osutils
 _osutils_LTLIBRARIES = _osutils.la
 _osutils_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_osutils
 _osutils_la_LIBADD = $(DESKBAR_LIBS)

Modified: trunk/deskbar/ui/iconentry/Makefile.am
==============================================================================
--- trunk/deskbar/ui/iconentry/Makefile.am	(original)
+++ trunk/deskbar/ui/iconentry/Makefile.am	Mon Apr 13 09:50:09 2009
@@ -1,6 +1,6 @@
 INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
 
-_iconentrydir = $(pythondir)/deskbar/ui/iconentry
+_iconentrydir = $(pyexecdir)/deskbar/ui/iconentry
 _iconentry_LTLIBRARIES = _iconentry.la
 _iconentry_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_iconentry
 _iconentry_la_LIBADD = $(DESKBAR_LIBS)