--- abiword\abi\src\af\ev\xp\Makefile.old	Sun May 23 15:13:08 1999
+++ abiword\abi\src\af\ev\xp\Makefile	Mon Nov 12 23:47:54 2001
@@ -40,6 +40,17 @@
 
 TARGETS=		$(OBJS)
 
 include $(ABI_ROOT)/src/config/abi_rules.mk
 
+# Test for iconv in system locations
+HAVE_ICONV_SYSTEM := $(shell if [ -r /usr/include/iconv.h -o -r /usr/local/include/iconv.h ] ; then echo 1 ; fi)
+
+ifeq ($(OS_NAME), WIN32)
+INCLUDES=		-I$(ABI_XX_ROOT)/../libiconv/include
+else
+ifneq ($(HAVE_ICONV_SYSTEM),1)
+INCLUDES= 		-I$(ABI_ROOT)/../libiconv/include
+endif
+endif
+
 build:: $(TARGETS)