diff -Naur libiconv/lib/Makefile.abi libiconv.mod/lib/Makefile.abi
--- libiconv/lib/Makefile.abi	Fri Aug 10 06:43:36 2001
+++ libiconv.mod/lib/Makefile.abi	Fri Aug 10 11:46:20 2001
@@ -25,8 +25,7 @@
 
 CSRCS=			iconv.c
 
-INCLUDES=		-I$(ABI_XX_ROOT)/../libiconv/include \
-				-I$(ABI_XX_ROOT)/../libiconv/libcharset/include
+INCLUDES=		-I../include -I../libcharset/include
 CFLAGS+=		-DHAVE_CONFIG_H -DLIBICONV_PLUG
 
 TARGETS=		$(OBJS)
diff -Naur libiconv/libcharset/lib/Makefile.abi libiconv.mod/libcharset/lib/Makefile.abi
--- libiconv/libcharset/lib/Makefile.abi	Fri Aug 10 06:43:36 2001
+++ libiconv.mod/libcharset/lib/Makefile.abi	Fri Aug 10 11:46:37 2001
@@ -25,8 +25,8 @@
 
 CSRCS=			localcharset.c
 
-INCLUDES=		-I. -I.. -I$(ABI_XX_ROOT)/../libiconv/libcharset/include
-CFLAGS+=		-DHAVE_CONFIG_H -DLIBICONV_PLUG
+INCLUDES=		-I. -I.. -I../include
+CFLAGS+=		-DHAVE_CONFIG_H -DLIBICONV_PLUG -DLIBDIR=\"\"
 
 TARGETS=		$(OBJS)