[banshee] build: Get MeeGo .desktop path from pkgconfig (bgo#646037)



commit ba413345e8690c04fecd510364df6cfadce9bfed
Author: Zhou Ting <ting z zhou intel com>
Date:   Tue Mar 29 21:32:22 2011 +0800

    build: Get MeeGo .desktop path from pkgconfig (bgo#646037)
    
    Signed-off-by: Gabriel Burt <gabriel burt gmail com>

 configure.ac                             |    2 ++
 src/Extensions/Banshee.MeeGo/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index abb28ae..d9149a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,8 @@ PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel,
 	HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
 if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
 	BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
+        MEEGO_PANELS_DIR=`$PKG_CONFIG --variable=meego_panel_panels_dir meego-panel`
+        AC_SUBST(MEEGO_PANELS_DIR)
 else
 	BANSHEE_DESKTOP_NAME="_Name=Banshee"
 fi
diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
index 20efead..f58e90e 100644
--- a/src/Extensions/Banshee.MeeGo/Makefile.am
+++ b/src/Extensions/Banshee.MeeGo/Makefile.am
@@ -39,7 +39,7 @@ com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.ser
 
 desktopfiles_in_files = meego-panel-banshee.desktop.in
 desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfilesdir = $(datadir)/mutter-meego/panels
+desktopfilesdir = $(MEEGO_PANELS_DIR)
 desktopfiles_DATA = $(desktopfiles_files)
 
 %.desktop.in: %.desktop.in.in Makefile



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]