diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 472e0e9161..05a52085ab 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2002-05-22 Tor Lillqvist + + * gdk-pixbuf-io.c (get_libdir): Use GTK_BINARY_VERSION (and not + GTK_VERSION) in the path to the loaders on Win32, too. + + * Makefile.am: Pass GTK_BINARY_VERSION. + 2002-05-18 Matthias Clasen * io-tiff.c (tiff_image_parse): fix packing order on bigendian diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 14f0a7e1a5..1635a83948 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -231,6 +231,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir)/gdk-pixbuf \ -I$(top_builddir)/gdk-pixbuf \ -DGTK_VERSION=\"@GTK_VERSION@\" \ + -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ @INCLUDED_LOADER_DEFINE@ \ diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 597d4ddabc..e24a216d43 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -269,7 +269,7 @@ get_libdir (void) if (libdir == NULL) libdir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "lib\\gtk-2.0\\" GTK_VERSION "\\loaders"); + (GETTEXT_PACKAGE, dll_name, "lib\\gtk-2.0\\" GTK_BINARY_VERSION "\\loaders"); return libdir; }