From 84ec06ca9cb1cb63ca2bdc859d79801db05ecac1 Mon Sep 17 00:00:00 2001
From: "Fred L. Drake, Jr." <fdrake@users.sourceforge.net>
Date: Sat, 21 Jul 2001 03:37:12 +0000
Subject: [PATCH] Support building from directories other than the source
 directory. Patch contributed by Mo DeJong -- thanks!

This closes SF patch #431340.
---
 expat/configure.in    | 6 +++---
 expat/lib/Makefile.in | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/expat/configure.in b/expat/configure.in
index f59ec45d..d1f4ce8e 100644
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -94,13 +94,13 @@ dnl in "embedded distributions", where only part of the Expat sources
 dnl are included in the sources for another project.
 
 OUTPUT="Makefile lib/Makefile lib/expat.h"
-if test -d xmlwf; then
+if test -d ${srcdir}/xmlwf; then
     OUTPUT="$OUTPUT xmlwf/Makefile"
 fi
-if test -d sample; then
+if test -d ${srcdir}/sample; then
     OUTPUT="$OUTPUT sample/Makefile"
 fi
-if test -d examples; then
+if test -d ${srcdir}/examples; then
     OUTPUT="$OUTPUT examples/Makefile"
 fi
 AC_OUTPUT($OUTPUT)
diff --git a/expat/lib/Makefile.in b/expat/lib/Makefile.in
index 3fbf9f6a..095f1ae4 100644
--- a/expat/lib/Makefile.in
+++ b/expat/lib/Makefile.in
@@ -77,7 +77,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 
-INCLUDES = -I$(srcdir) -I..
+INCLUDES = -I$(srcdir) -I. -I..
 DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"'
 
 CPPFLAGS = @CPPFLAGS@