gobject-introspection r502 - in trunk: . gir girepository

[walters svn gnome org]

Author: walters
Date: Tue Aug 26 21:55:42 2008
New Revision: 502
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=502&view=rev

Log:
2008-08-26  Colin Walters  <walters verbum org>

	* girepository/girepository.c: Search
	$DATADIR/girepository instead of
	$DATADIR/gitypelibs; this naming makes
	it clearer that e.g. jgir can install
	.jars there.
	* gir/Makefile.am: Install there.


Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am
   trunk/girepository/girepository.c

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Aug 26 21:55:42 2008
@@ -66,7 +66,7 @@
 %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler
 	$(DEBUG) $(top_builddir)/tools/g-ir-compiler $< -o $@
 
-typelibsdir = $(datadir)/gitypelibs
+typelibsdir = $(datadir)/girepository
 typelibs_DATA = GLib.typelib GObject.typelib Gio.typelib
 CLEANFILES += $(typelibs_DATA)
 

Modified: trunk/girepository/girepository.c
==============================================================================
--- trunk/girepository/girepository.c	(original)
+++ trunk/girepository/girepository.c	Tue Aug 26 21:55:42 2008
@@ -93,7 +93,7 @@
       
       search_path = NULL;
       for (dir = datadirs; *dir; dir++) {
-	char *path = g_build_filename (*dir, "gitypelibs", NULL);
+	char *path = g_build_filename (*dir, "girepository", NULL);
 	search_path = g_slist_prepend (search_path, path);
       }
       search_path = g_slist_reverse (search_path);