diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-09-11 20:24:40 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-11 20:24:40 +0000 |
| commit | 69915aa7104beebdcfbc6d42592481843069c403 (patch) | |
| tree | 933c4c9172a34de05399eb080a541c0bd6254979 /modules | |
| parent | 13ff590365e84e5470c72bf42bab98177fbc167f (diff) | |
| download | gdk-pixbuf-69915aa7104beebdcfbc6d42592481843069c403.tar.gz | |
Implement a search path for GTK+ modules.
Sat Sep 8 16:19:02 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Implement a search path for GTK+ modules.
* configure.in gtk/gtkrc.c gtk/Makefile.am: Look for modules
in gtk-2.0/<type>/major.minor.(micro-binary_age) rather
than in gtk-2.0/major.minor.micro/<type>/. This
works better for a search path for modules.
* gtk+-2.0.pc.in gtk+-2.0-uninstalled.pc.in: Add
gtk_binary_version variable holding major.minor.(micro-binary_age).
* modules/input/Makefile.am (moduledir): Fix installation
directory to match change in lookup location.
* gtk/gtkmain.c (gtk_init_check): Remove OS/2 code for dll
suffixes. Needs to be handled in g_module_build_path().
* gtk/gtkrc.c gtk/queryimmodules.c: Use g_build_filename() where
appropriate.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 9d6cf304d..5f9fbf894 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -22,7 +22,7 @@ LDADDS = @STRIP_BEGIN@ \ @GTK_DEP_LIBS@ \ @STRIP_END@ -moduledir = $(libdir)/gtk-2.0/$(GTK_VERSION)/immodules +moduledir = $(libdir)/gtk-2.0/immodules/$(GTK_BINARY_VERSION) im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module im_xim_la_SOURCES = \ |