diff -urN expat-1.95.8/configure.in expat-1.95.8-1/configure.in
--- expat-1.95.8/configure.in	2004-04-30 05:18:09.000000000 +0200
+++ expat-1.95.8-1/configure.in	2005-05-09 09:56:27.000000000 +0200
@@ -119,7 +119,8 @@
 AC_DEFINE([XML_CONTEXT_BYTES], 1024,
           [Define to specify how much context to retain around the current parse point.])
 
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(Makefile
+                tests/xmltest.sh)
 AC_OUTPUT
 
 abs_srcdir="`cd $srcdir && pwd`"
diff -urN expat-1.95.8/Makefile.in expat-1.95.8-1/Makefile.in
--- expat-1.95.8/Makefile.in	2004-05-07 22:00:48.000000000 +0200
+++ expat-1.95.8-1/Makefile.in	2005-05-09 09:56:27.000000000 +0200
@@ -34,6 +34,7 @@
 
 top_builddir = .
 
+EXEEXT=@EXEEXT@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -45,17 +46,20 @@
 LIBRARY = libexpat.la
 
 
-default:  buildlib xmlwf/xmlwf
+default:  buildlib xmlwf/xmlwf$(EXEEXT)
 
 buildlib: $(LIBRARY)
 
-all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
+all: $(LIBRARY) \
+	xmlwf/xmlwf$(EXEEXT) \
+	examples/elements$(EXEEXT) \
+	examples/outline$(EXEEXT)
 
 clean:
 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
-	cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
-	cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs
-	cd tests && rm -rf .libs runtests runtests.o chardata.o
+	cd xmlwf && rm -f xmlwf *.$(EXEEXT) *.o *.lo && rm -rf .libs _libs
+	cd examples && rm -f elements outline *.$(EXEEXT) *.o *.lo && rm -rf .libs _libs
+	cd tests && rm -rf .libs runtests *.$(EXEEXT) runtests.o chardata.o
 	rm -rf .libs libexpat.la
 	rm -f examples/core tests/core xmlwf/core
 
@@ -69,26 +73,26 @@
 	rm -f expat_config.h.in configure
 	rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
 
-check: tests/runtests
-	tests/runtests
+check: tests/runtests$(EXEEXT)
+	tests/runtests$(EXEEXT)
 
-install: xmlwf/xmlwf installlib
-	$(mkinstalldirs) $(bindir) $(man1dir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-	$(INSTALL_DATA) $(MANFILE) $(man1dir)
+install: xmlwf/xmlwf$(EXEEXT) installlib
+	$(mkinstalldirs) $(DESTDIR)/$(bindir) $(DESTDIR)/$(man1dir)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)/$(bindir)/xmlwf
+	$(INSTALL_DATA) $(MANFILE) $(DESTDIR)/$(man1dir)
 
 installlib: $(LIBRARY) $(APIHEADER)
-	$(mkinstalldirs) $(libdir) $(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
-	$(INSTALL_DATA) $(APIHEADER) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)/$(libdir) $(DESTDIR)/$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)/$(libdir)/$(LIBRARY)
+	$(INSTALL_DATA) $(APIHEADER) $(DESTDIR)/$(includedir)
 
 uninstall: uninstalllib
-	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-	rm -f $(man1dir)/xmlwf.1
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)/$(bindir)/xmlwf
+	rm -f $(DESTDIR)/$(man1dir)/xmlwf.1
 
 uninstalllib:
-	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
-	rm -f $(includedir)/$(APIHEADER)
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)/$(libdir)/$(LIBRARY)
+	rm -f $(DESTDIR)/$(includedir)/$(APIHEADER)
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
@@ -134,21 +138,21 @@
 xmlwf/xmlfile.o: xmlwf/xmlfile.c
 xmlwf/codepage.o: xmlwf/codepage.c
 xmlwf/@FILEMAP@.o: xmlwf/@FILEMAP@.c
-xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY)
+xmlwf/xmlwf$(EXEEXT): $(XMLWF_OBJS) $(LIBRARY)
 	$(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY)
 
 examples/elements.o: examples/elements.c
-examples/elements: examples/elements.o $(LIBRARY)
+examples/elements$(EXEEXT): examples/elements.o $(LIBRARY)
 	$(LINK_EXE) $< $(LIBRARY)
 
 examples/outline.o: examples/outline.c
-examples/outline: examples/outline.o $(LIBRARY)
+examples/outline$(EXEEXT): examples/outline.o $(LIBRARY)
 	$(LINK_EXE) $< $(LIBRARY)
 
 tests/chardata.o: tests/chardata.c tests/chardata.h
 tests/minicheck.o: tests/minicheck.c tests/minicheck.h
 tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o @MINICHECK_OBJECT@ $(LIBRARY)
+tests/runtests$(EXEEXT): tests/runtests.o tests/chardata.o @MINICHECK_OBJECT@ $(LIBRARY)
 	$(LINK_EXE) $^ @CHECK_LIBRARY@
 
 tests/xmlts.zip:
@@ -158,7 +162,7 @@
 tests/XML-Test-Suite: tests/xmlts.zip
 	cd tests && unzip -q xmlts.zip
 
-run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
+run-xmltest: xmlwf/xmlwf$(EXEEXT) tests/XML-Test-Suite
 	tests/xmltest.sh
 
 .SUFFIXES: .c .lo .o
diff -urN expat-1.95.8/tests/xmltest.sh.in expat-1.95.8-1/tests/xmltest.sh.in