From 9c21ce3eb577a92e4c388f6df594827e7ace9438 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 1 Dec 2008 20:42:56 +0000 Subject: [PATCH] Adjust to new Meta.typelib/Meta.gir locations Also put all our GI data in the private $(pkglibdir). svn path=/trunk/; revision=100 --- src/Makefile.am | 8 +++++--- src/gnome-shell-plugin.c | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3098f9cad..01b563199 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,6 +8,7 @@ gnome_shell_cflags = \ $(MUTTER_PLUGIN_CFLAGS) \ -Itray \ -DGETTEXT_PACKAGE=gnome-shell \ + -DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \ -DJSDIR=\"$(pkgdatadir)/js\" plugindir = $(libdir)/metacity/plugins/clutter @@ -63,13 +64,14 @@ libgnome_shell_la_LIBADD = \ libtray.la libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) -typelibdir = $(pkglibdir)/girepository +typelibdir = $(pkglibdir) typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la Makefile $(G_IR_SCANNER) \ --namespace=Shell \ --nsversion=0.1 \ + --add-include-path=$(libdir)/metacity/ \ --include=Clutter-0.8 \ --include=Meta-2.25 \ --program=metacity \ @@ -82,7 +84,7 @@ CLEANFILES += Shell-1.0.gir # The dependency on libgnome-shell.la here is because g-ir-compiler opens it # (not the fake library, since we've already done the rewriting) Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(libdir)/metacity/ Shell-0.1.gir -o $@ CLEANFILES += Shell-1.0.typelib Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile @@ -100,4 +102,4 @@ CLEANFILES += Tidy-1.0.gir Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Tidy-1.0.gir -o $@ -CLEANFILES += Tidy-1.0.typelib \ No newline at end of file +CLEANFILES += Tidy-1.0.typelib diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c index edc2aa7de..63eebe577 100644 --- a/src/gnome-shell-plugin.c +++ b/src/gnome-shell-plugin.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -122,6 +123,8 @@ do_init (const char *params) } } + g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR); + shell_js = g_getenv("GNOME_SHELL_JS"); if (!shell_js) shell_js = JSDIR;