From df8de3a72c4997c5b95ef764fb8db6cd9fb6678b Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Thu, 13 Dec 2007 11:45:20 +0100 Subject: [PATCH] hmmm first move of a plugin --- src/Makefile.am | 6 +++--- src/plugin.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f62cdb6..8cf785d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -#bin_PROGRAMS=osdplugin_la -libdir=${prefix}/share/gmpc/plugins/ +libdir=${prefix}/lib/gmpc/plugins/ +datadestdir = $(datadir)/gmpc/plugins/magnatune/ lib_LTLIBRARIES = magnatuneplugin.la @@ -21,6 +21,6 @@ endif magnatuneplugin_la_LIBADD= $(gmpcmagnatune_LIBS) $(gmpcmagnatune2_LIBS) -magnatuneplugin_la_CFLAGS= $(gmpcmagnatune_CFLAGS) $(gmpcmagnatune2_CFLAGS) -I./ -I./axl/ +magnatuneplugin_la_CFLAGS= $(gmpcmagnatune_CFLAGS) $(gmpcmagnatune2_CFLAGS) -I./ -I./axl/ -DDATA_DIR=\"${DESTDIR}${datadestdir}\" magnatuneplugin_la_LDFLAGS= -module -avoid-version diff --git a/src/plugin.c b/src/plugin.c index df58515..c2b003e 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -90,7 +90,7 @@ extern GladeXML *pl3_xml; static void magnatune_buy_album() { gchar *uri = "http://www.magnatune.com/"; - gchar *path = g_strdup_printf("%s%c%s%c%s '%s'",plugin.path,G_DIR_SEPARATOR, "magnatune",G_DIR_SEPARATOR,"xdg-open",uri); + gchar *path = g_strdup_printf("%s%c%s '%s'",DATA_DIR,G_DIR_SEPARATOR,"xdg-open",uri); g_spawn_command_line_async(path, NULL); g_free(path); } @@ -128,9 +128,7 @@ static void magnatune_logo_init() { gchar *path = NULL; - path = g_strdup_printf("%s%c%s",plugin.path,G_DIR_SEPARATOR, "magnatune"); - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default (),path); - g_free(path); + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default (),DATA_DIR); gtk_init_add((GtkFunction )magnatune_logo_add, NULL); /** -- 2.11.4.GIT