$NetBSD: patch-ai,v 1.2 2006/06/06 15:40:15 joerg Exp $

--- progs/japhard/Makefile.in.orig	1999-03-16 03:25:11.000000000 +0000
+++ progs/japhard/Makefile.in
@@ -87,16 +87,16 @@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C
 @NEED_ZLIB_TRUE@ZLIB = $(top_builddir)/lib/zlib/libzlib.la
 @NEED_ZLIB_FALSE@ZLIB = @ZLIB@
 
-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
+@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
 
-SUBDIRS = readline
+SUBDIRS =
 
 bin_PROGRAMS = japhard
 
 japhard_SOURCES = break.c 			cmd_line.c 			japhard.c 			stack.c 			break.h 			cmds.h 			stack.h
 
 
-japhard_LDADD =  	$(top_builddir)/lib/libjni/src/libjni.la 	$(top_builddir)/lib/libruntime/libruntime.la 	$(top_builddir)/lib/libjvmdi/src/libjvmdi.la 	$(top_builddir)/arch/libarch.la 	-L/usr/local/lib @X_PRE_LIBS@ @X_LIBS@ $(ZLIB) $(LIBFFI) 	$(top_builddir)/progs/japhard/readline/libreadline.a 	-ltermcap
+japhard_LDADD =  	$(top_builddir)/lib/libjni/src/libjni.la 	$(top_builddir)/lib/libruntime/libruntime.la 	$(top_builddir)/lib/libjvmdi/src/libjvmdi.la 	$(top_builddir)/arch/libarch.la 	-L/usr/local/lib @X_PRE_LIBS@ @X_LIBS@ $(ZLIB) $(LIBFFI) 	-lreadline 	-ltermcap
 
 
 INCLUDES =  -I$(top_srcdir)/include 		-I$(top_srcdir)/lib/libjvmdi/include 		-I$(top_srcdir)/lib/libjni/include 		-I$(top_builddir)/lib/libjni/include @OS_DEFINE@ 		-DVERSION="@VERSION@"
@@ -120,30 +120,24 @@ japhard_OBJECTS =  break.o cmd_line.o ja
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/arch/libarch.la \
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/progs/japhard/readline/libreadline.a
+@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/arch/libarch.la
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@japhard_DEPENDENCIES =  \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la \
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/progs/japhard/readline/libreadline.a
+@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/zlib/libzlib.la
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@japhard_DEPENDENCIES =  \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
 @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/arch/libarch.la \
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/zlib/libzlib.la \
-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/progs/japhard/readline/libreadline.a
+@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/zlib/libzlib.la
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@japhard_DEPENDENCIES =  \
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
 @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la \
-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/progs/japhard/readline/libreadline.a
+@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la
 japhard_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -364,18 +358,15 @@ cmd_line.o: cmd_line.c ../../include/con
 	../../lib/libjni/include/jni.h \
 	../../lib/libjni/include/jnitypes.h ../../include/ClazzFile.h \
 	../../include/native-threads.h ../../include/sig.h stack.h \
-	break.h ../../lib/libjvmdi/include/jvmdi.h cmds.h \
-	readline/readline.h readline/keymaps.h readline/chardefs.h \
-	readline/tilde.h
+	break.h ../../lib/libjvmdi/include/jvmdi.h cmds.h
 japhard.o: japhard.c ../../include/config.h \
 	../../lib/libjvmdi/include/jvmdi.h \
 	../../lib/libjni/include/jni.h \
 	../../lib/libjni/include/jnitypes.h ../../include/gc.h \
-	../../include/log.h cmds.h readline/readline.h \
-	readline/keymaps.h readline/chardefs.h readline/tilde.h break.h \
+	../../include/log.h cmds.h break.h \
 	../../include/ClazzFile.h ../../include/native-threads.h \
 	../../include/sig.h ../../include/classpath.h \
-	../../include/zipfile.h stack.h readline/history.h
+	../../include/zipfile.h stack.h
 stack.o: stack.c ../../lib/libjni/include/jniint.h \
 	../../lib/libjni/include/jni.h \
 	../../lib/libjni/include/jnitypes.h ../../include/classpath.h \