diff -Naur w3c-libwww-5.4.1/ComLine/src/Makefile.am w3c-libwww-5.4.1.oden/ComLine/src/Makefile.am
--- w3c-libwww-5.4.1/ComLine/src/Makefile.am 2003-03-21 06:41:59.000000000 -0500
+++ w3c-libwww-5.4.1.oden/ComLine/src/Makefile.am 2008-07-11 04:47:16.000000000 -0400
@@ -25,8 +25,8 @@
SUBDIRS = windows
INCLUDES = \
- -I$(srcdir)/../../Library/src \
- -I$(top_srcdir)/modules/expat/lib
+ -I$(includedir) \
+ -I$(srcdir)/../../Library/src
# .h files are distributed but originally are made from the
# self-documenting hypertext files.
diff -Naur w3c-libwww-5.4.1/Library/Examples/Makefile.am w3c-libwww-5.4.1.oden/Library/Examples/Makefile.am
--- w3c-libwww-5.4.1/Library/Examples/Makefile.am 2003-03-21 05:15:44.000000000 -0500
+++ w3c-libwww-5.4.1.oden/Library/Examples/Makefile.am 2008-07-11 04:46:57.000000000 -0400
@@ -31,8 +31,8 @@
-lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@
INCLUDES = \
+ -I$(includedir) \
-I$(srcdir)/../src \
- -I$(top_srcdir)/modules/expat/lib \
-I$(srcdir)/../src/SSL
DOCS := $(wildcard *.html)
diff -Naur w3c-libwww-5.4.1/Library/src/Makefile.am w3c-libwww-5.4.1.oden/Library/src/Makefile.am
--- w3c-libwww-5.4.1/Library/src/Makefile.am 2006-12-03 13:12:52.000000000 -0500
+++ w3c-libwww-5.4.1.oden/Library/src/Makefile.am 2008-07-11 04:45:09.000000000 -0400
@@ -362,10 +362,7 @@
HTXML.h \
HTXML.c
-libwwwxml_la_DEPENDENCIES = \
- ../../modules/expat/libexpat.la
-
-libwwwxml_la_LDFLAGS = -rpath $(libdir)
+libwwwxml_la_LDFLAGS = -lexpat -rpath $(libdir)
libwwwzip_la_SOURCES = \
WWWZip.h \
@@ -386,9 +383,8 @@
libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS)
INCLUDES = \
- -I/usr/local/include \
+ -I$(includedir) \
-I${top_srcdir}/modules/md5 \
- -I${top_srcdir}/modules/expat/lib \
$(MYSQL_CFLAGS)
BUILT_SOURCES = \
diff -Naur w3c-libwww-5.4.1/LineMode/src/Makefile.am w3c-libwww-5.4.1.oden/LineMode/src/Makefile.am
--- w3c-libwww-5.4.1/LineMode/src/Makefile.am 2003-03-21 06:39:18.000000000 -0500
+++ w3c-libwww-5.4.1.oden/LineMode/src/Makefile.am 2008-07-11 04:46:11.000000000 -0400
@@ -26,8 +26,8 @@
SUBDIRS = windows vms
INCLUDES = \
+ -I$(includedir) \
-I$(srcdir)/../../Library/src \
- -I$(top_srcdir)/modules/expat/lib \
-I$(srcdir)/../../PICS-client/src
# .h files are distributed but originally are made from the
diff -Naur w3c-libwww-5.4.1/modules/Makefile.am w3c-libwww-5.4.1.oden/modules/Makefile.am
--- w3c-libwww-5.4.1/modules/Makefile.am 1999-02-21 18:56:18.000000000 -0500
+++ w3c-libwww-5.4.1.oden/modules/Makefile.am 2008-07-11 04:45:09.000000000 -0400
@@ -5,5 +5,5 @@
EXTRA_DIST = \
$(DOCS)
-SUBDIRS = expat md5
+SUBDIRS = md5
diff -Naur w3c-libwww-5.4.1/Robot/src/Makefile.am w3c-libwww-5.4.1.oden/Robot/src/Makefile.am
--- w3c-libwww-5.4.1/Robot/src/Makefile.am 2006-12-03 13:12:52.000000000 -0500
+++ w3c-libwww-5.4.1.oden/Robot/src/Makefile.am 2008-07-11 04:46:29.000000000 -0400
@@ -27,9 +27,9 @@
SUBDIRS = windows
INCLUDES = \
+ -I$(includedir) \
-I$(srcdir)/../../Library/src \
-I$(srcdir)/../../Library/src/SSL \
- -I$(top_srcdir)/modules/expat/lib \
$(MYSQL_CFLAGS)
# .h files are distributed but originally are made from the
