Use GTK_BINARY_VERSION (and not GTK_VERSION) in the path to the loaders on

2002-05-22  Tor Lillqvist  <tml@iki.fi>

	* 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.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 0e77158f53564fefdbff74420625d041cb0ad0c7..1de74afbe0aa0e3c017e364e827dab0f8231fbe8 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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-22  Federico Mena Quintero  <federico@ximian.com>
 
        * io-xpm.c (pixbuf_create_from_xpm): Ahem, take the rowstride into

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index f39ea266e15c979fa722df15fec3eaac7a16e43d..4833092a93d1adfd25819f6ebe6eb35b425d0cd2 100644 (file)
--- 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 9b352d089f01a3687e4c40a7f86a5d0f74253cea..b0e03319a887fd2cadedc396f18e05eccb797931 100644 (file)
--- 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;
 }