From: Matthias Clasen Date: Fri, 10 Oct 2008 05:00:17 +0000 (+0000) Subject: Bug 555121 – Improved build-time handling of gio module-dir X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b8f103901f3a2fc090205a3c1115e74f1ce089fb;p=dana%2Fcg-glib.git Bug 555121 – Improved build-time handling of gio module-dir 2008-10-10 Matthias Clasen 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 a3e07e4c..8e9d7906 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,10 @@ +2008-10-10 Matthias Clasen + + 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 * gio/glocalfileinfo.c: diff --git a/gio/Makefile.am b/gio/Makefile.am index 971bdebc..be6568f8 100644 --- 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 b5ffefca..29ae072d 100644 --- 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 \