diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 211a00e2c3..e182f7b7eb 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 27 17:10:30 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* Makefile.am (gdk-pixbuf.loaders): Rewrite to run
+ 	on the .la files rather than looking for .so files.
+ 	(#102142, Martin Gansser)
+ 
+ 	* Makefile.am: Don't build gdk-pixbuf.loaders when
+ 	cross-compiling.
+ 
 2003-01-05  Tor Lillqvist  <tml@iki.fi>
 
 	* Makefile.am (gdk-pixbuf.loaders): Use @SOEXT@ in the find command.
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 466c95871e..390a70917c 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -433,12 +433,16 @@ install-data-local: install-ms-lib install-libtool-import-lib
 	  echo "***" ; \
 	fi
 
+if CROSS_COMPILING
+else
 all-local: gdk-pixbuf.loaders
+endif
 
 gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
-	if find . -name 'libpixbufloader-*.@SOEXT@' | grep '@SOEXT@' > /dev/null ; then \
+	LOADERS=`echo libpixbufloader-*.la` ; \
+	if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
           echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
-	  GDK_PIXBUF_MODULEDIR=.libs $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > ./gdk-pixbuf.loaders ;\
+	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
 	else \
           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
 	  touch gdk-pixbuf.loaders; \