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

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.

svn path=/trunk/; revision=7586

diff --git a/gio/ChangeLog b/gio/ChangeLog
index a3e07e4..8e9d790 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,12 @@
 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.
+
+2008-10-10  Matthias Clasen  <mclasen@redhat.com>
+
        * gio/glocalfileinfo.c:
        * gio/tests/live-g-file.c:
        * gio/gsimpleasyncresult.c: Fix gcc warnings.

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 971bdeb..be6568f 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -265,6 +265,7 @@ export_symbols = -export-symbols-regex '^g_.*'
 endif
 
 install-data-local: install-ms-lib install-def-file
+       $(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
 

diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am
index b5ffefc..29ae072 100644 (file)
--- a/gio/fam/Makefile.am
+++ b/gio/fam/Makefile.am
@@ -5,7 +5,7 @@ NULL =
 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                    \