diff -urP -X../cludes ../elf2flt-20020214.orig/Makefile.in Makefile.in
--- ../elf2flt-20020214.orig/Makefile.in	Wed Feb 13 10:22:55 2002
+++ Makefile.in	Thu Feb 14 17:05:43 2002
@@ -1,22 +1,38 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
 
 CC = @CC@
 CPU = @target_cpu@
 TARGET = @target_alias@
-CFLAGS = @CFLAGS@ -static -DTARGET_$(CPU)
-LDFLAGS = @LDFLAGS@ @LIBS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@ -static
+LIBS = @LIBS@
 INSTALL = @INSTALL@
-INSTALLDIR = @prefix@
+DEFS = @DEFS@ -DTARGET_$(CPU)
+
+CCFLAGS = $(CFLAGS) $(DEFS) $(INCLUDES)
+
+
+target_bindir = $(prefix)/$(TARGET)/bin
+target_libdir = $(prefix)/$(TARGET)/lib
 
 PROGS = elf2flt flthdr
 
 
 all: $(PROGS)
 
-elf2flt: elf2flt.c Makefile
-	$(CC) $(CFLAGS) -o $@ elf2flt.c $(LDFLAGS)
+elf2flt: $(srcdir)/elf2flt.c Makefile
+	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/elf2flt.c $(LIBS)
 
-flthdr: flthdr.c Makefile
-	$(CC) $(CFLAGS) -o $@ flthdr.c $(LDFLAGS)
+flthdr: $(srcdir)/flthdr.c Makefile
+	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/flthdr.c $(LIBS)
 
 clean:
 	-rm -f $(PROGS) *.[oa]
@@ -25,15 +41,14 @@
 	-rm -f Makefile config.log config.status config.cache
 
 install:
-	$(INSTALL) -s -m 755 flthdr $(INSTALLDIR)/bin/$(TARGET)-flthdr
-	$(INSTALL) -s -m 755 flthdr $(INSTALLDIR)/$(TARGET)/bin/flthdr
-	$(INSTALL) -s -m 755 elf2flt $(INSTALLDIR)/bin/$(TARGET)-elf2flt
-	$(INSTALL) -s -m 755 elf2flt $(INSTALLDIR)/$(TARGET)/bin/elf2flt
-	[ -f $(INSTALLDIR)/bin/$(TARGET)-ld.real ] || \
-		mv $(INSTALLDIR)/bin/$(TARGET)-ld $(INSTALLDIR)/bin/$(TARGET)-ld.real
-	[ -f $(INSTALLDIR)/$(TARGET)/bin/ld.real ] || \
-		mv $(INSTALLDIR)/$(TARGET)/bin/ld $(INSTALLDIR)/$(TARGET)/bin/ld.real
-	$(INSTALL) -m 755 ld-elf2flt $(INSTALLDIR)/bin/$(TARGET)-ld
-	$(INSTALL) -m 755 ld-elf2flt $(INSTALLDIR)/$(TARGET)/bin/ld
-	$(INSTALL) -m 644 elf2flt.ld $(INSTALLDIR)/$(TARGET)/lib
-
+	$(INSTALL) -s -m 755 flthdr $(bindir)/$(TARGET)-flthdr
+	$(INSTALL) -s -m 755 flthdr $(target_bindir)/flthdr
+	$(INSTALL) -s -m 755 elf2flt $(bindir)/$(TARGET)-elf2flt
+	$(INSTALL) -s -m 755 elf2flt $(target_bindir)/elf2flt
+	[ -f $(bindir)/$(TARGET)-ld.real ] || \
+		mv $(bindir)/$(TARGET)-ld $(bindir)/$(TARGET)-ld.real
+	[ -f $(target_bindir)/ld.real ] || \
+		mv $(target_bindir)/ld $(target_bindir)/ld.real
+	$(INSTALL) -m 755 $(srcdir)/ld-elf2flt $(bindir)/$(TARGET)-ld
+	$(INSTALL) -m 755 $(srcdir)/ld-elf2flt $(target_bindir)/ld
+	$(INSTALL) -m 644 $(srcdir)/elf2flt.ld $(target_libdir)
diff -urP -X../cludes ../elf2flt-20020214.orig/configure.in configure.in
--- ../elf2flt-20020214.orig/configure.in	Wed Feb 13 10:22:53 2002
+++ configure.in	Thu Feb 14 17:17:26 2002
@@ -1,21 +1,17 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(elf2flt.c)
 
-AC_MSG_CHECKING(--with-libbfd=?)
 AC_ARG_WITH(libbfd,
 	[ --with-libbfd=<file>  path to libbfd.a library to use ],
 	[ ac_libbfd=$withval ],
 	[ ac_libbfd=NONE ]
 )
-AC_MSG_RESULT($ac_libbfd)
 
-AC_MSG_CHECKING(--with-libiberty=?)
 AC_ARG_WITH(libiberty,
 	[ --with-libiberty=<file>  path to libiberty.a library to use ],
 	[ ac_libiberty=$withval ],
 	[ ac_libiberty=NONE ]
 )
-AC_MSG_RESULT($ac_libiberty)
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -25,6 +21,19 @@
 AC_PROG_INSTALL
 
 dnl Checks for libraries.
+if test "$ac_libiberty" = "NONE"; then
+  AC_CHECK_LIB(iberty, objalloc_create)
+  ac_libiberty=auto
+else
+  LIBS="$ac_libiberty $LIBS"
+fi
+if test "$ac_libbfd" = "NONE"; then
+  AC_CHECK_LIB(bfd, bfd_openr)
+  ac_libbfd=auto
+else
+  LIBS="$ac_libbfd $LIBS"
+fi
+
 if test "$ac_libbfd" = "NONE" -o "$ac_libiberty" = "NONE" ; then
 	echo
 	echo "You need to specify the location of the libfd.a and libiberty.a"
@@ -36,7 +45,6 @@
 	echo
 	exit 1
 fi
-LDFLAGS="$LDFLAGS $ac_libbfd $ac_libiberty"
 
 dnl Checks for header files.
 AC_HEADER_STDC