glib r7588 - in branches/glib-2-18/gio: . fam

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Oct 10 05:12:22 2008
New Revision: 7588
URL: http://svn.gnome.org/viewvc/glib?rev=7588&view=rev

Log:
2008-10-10  Matthias Clasen  <mclasen redhat com>

        Bug 555121 â Improved build-time handling of gio module-dir

        * fam/Makefile.am: Use GIO_MODULE_DIR consistently.
        * Makefile.am: Create the module dir.



Modified:
   branches/glib-2-18/gio/ChangeLog
   branches/glib-2-18/gio/Makefile.am
   branches/glib-2-18/gio/fam/Makefile.am

Modified: branches/glib-2-18/gio/Makefile.am
==============================================================================
--- branches/glib-2-18/gio/Makefile.am	(original)
+++ branches/glib-2-18/gio/Makefile.am	Fri Oct 10 05:12:22 2008
@@ -265,6 +265,7 @@
 endif
 
 install-data-local: install-ms-lib install-def-file
+	$(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
 

Modified: branches/glib-2-18/gio/fam/Makefile.am
==============================================================================
--- branches/glib-2-18/gio/fam/Makefile.am	(original)
+++ branches/glib-2-18/gio/fam/Makefile.am	Fri Oct 10 05:12:22 2008
@@ -5,7 +5,7 @@
 module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
 
 giomodule_LTLIBRARIES = libgiofam.la
-giomoduledir = $(libdir)/gio/modules
+giomoduledir = $(GIO_MODULE_DIR)
 
 libgiofam_la_SOURCES = 		\
 	fam-helper.c			\