--- elfutils-0.97/Makefile.am.orig	2004-01-18 23:24:16.000000000 +0000
+++ elfutils-0.97/Makefile.am	2005-02-10 18:01:28.029920520 +0000
@@ -18,9 +18,8 @@
 ##
 ACLOCAL_AMFLAGS = -I m4
 
-mini_SUBDIRS = config m4 lib libelf libelf-po
-all_SUBDIRS = doc libebl libdw libcpu libasm src po tests
-SUBDIRS = $(mini_SUBDIRS) $(all_SUBDIRS)
+mini_SUBDIRS = config m4 libelf libelf-po
+SUBDIRS = $(mini_SUBDIRS)
 
 EXTRA_DIST = splint.rc elfutils.spec GPG-KEY NOTES COPYING.GPL
 
--- elfutils-0.97/configure.ac.orig	2004-09-25 19:41:03.000000000 +0000
+++ elfutils-0.97/configure.ac	2005-02-10 18:01:28.030920377 +0000
@@ -130,34 +130,9 @@
 
 dnl The directories with content.
 
-dnl Documentation.
-AC_CONFIG_FILES([doc/Makefile])
-
-dnl Support library.
-AC_CONFIG_FILES([lib/Makefile])
-
 dnl ELF library.
 AC_CONFIG_FILES([libelf/Makefile libelf-po/Makefile.in])
 
-dnl Higher-level ELF support library.
-AC_CONFIG_FILES([libebl/Makefile])
-
-dnl DWARF library.
-AC_CONFIG_FILES([libdw/Makefile])
-
-dnl CPU handling library.
-AC_CONFIG_FILES([libcpu/Makefile])
-
-dnl Assembler library.
-AC_CONFIG_FILES([libasm/Makefile])
-
-dnl Tools.
-AC_CONFIG_FILES([src/Makefile po/Makefile.in])
-
-dnl Test suite.
-AC_CONFIG_FILES([tests/Makefile])
-
-
 dnl Test of the config.h file.  We hide all kinds of configuration magic
 dnl in there.
 AH_BOTTOM([
--- elfutils-0.97/libelf-po/Makefile.in.in.orig	2004-01-18 23:51:37.000000000 +0000
+++ elfutils-0.97/libelf-po/Makefile.in.in	2005-02-10 18:01:28.030920377 +0000
@@ -28,7 +28,7 @@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = @MKINSTALLDIRS@
 
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
--- elfutils-0.97/libelf/Makefile.am.orig	2004-01-23 10:38:49.000000000 +0000
+++ elfutils-0.97/libelf/Makefile.am	2005-02-10 18:03:15.337610448 +0000
@@ -31,15 +31,15 @@
 
 LINT = splint
 
-lib_LIBRARIES = libelf.a
+#lib_LIBRARIES = libelf.a
 if !MUDFLAP
-noinst_LIBRARIES = libelf_pic.a
-noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so)
+noinst_LIBRARIES = libelf.a libelf_pic.a
+noinst_PROGRAMS = libelf.so
 endif
-include_HEADERS = libelf.h gelf.h nlist.h
+#include_HEADERS = libelf.h gelf.h nlist.h
 
-euincludedir = $(includedir)/elfutils
-euinclude_HEADERS = elf-knowledge.h
+#euincludedir = $(includedir)/elfutils
+#euinclude_HEADERS = elf-knowledge.h
 
 libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \
 		   elf_begin.c elf_next.c elf_rand.c elf_end.c elf_kind.c \
@@ -96,7 +96,7 @@
 	ln -fs $@ $@.$(VERSION)
 
 %.os: %.c %.o
-	if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
+	if $(COMPILE) -c -o $@ -fPIC -DPIC -DSHARED -MT $@ -MD -MP \
 	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
@@ -104,15 +104,15 @@
 	fi
 
 install: install-am libelf.so
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	$(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so
-	ln -fs libelf-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libelf.so.$(VERSION)
-	ln -fs libelf.so.$(VERSION) $(DESTDIR)$(libdir)/libelf.so
+#	$(mkinstalldirs) $(DESTDIR)$(libdir)
+#	$(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so
+#	ln -fs libelf-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libelf.so.$(VERSION)
+#	ln -fs libelf.so.$(VERSION) $(DESTDIR)$(libdir)/libelf.so
 
 uninstall: uninstall-am
-	rm -f $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so
-	rm -f $(DESTDIR)$(libdir)/libelf.so.$(VERSION)
-	rm -f $(DESTDIR)$(libdir)/libelf.so
+#	rm -f $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so
+#	rm -f $(DESTDIR)$(libdir)/libelf.so.$(VERSION)
+#	rm -f $(DESTDIR)$(libdir)/libelf.so
 endif
 
 .PSEUDO: lint
--- elfutils-0.97/libelf/Makefile.in.orig	2004-09-25 19:41:08.000000000 +0000
+++ elfutils-0.97/libelf/Makefile.in	2005-02-10 18:01:28.028920662 +0000
@@ -731,7 +731,7 @@
 @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
 
 @MUDFLAP_FALSE@%.os: %.c %.o
-@MUDFLAP_FALSE@	if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
+@MUDFLAP_FALSE@	if $(COMPILE) -c -o $@ -fPIC -DPIC -DSHARED -MT $@ -MD -MP \
 @MUDFLAP_FALSE@	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 @MUDFLAP_FALSE@	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 @MUDFLAP_FALSE@	     rm -f "$(DEPDIR)/$*.Tpo"; \
--- elfutils-0.97/libelf/libelfP.h.orig	2003-12-25 18:43:31.000000000 +0000
+++ elfutils-0.97/libelf/libelfP.h	2005-02-10 18:01:28.029920520 +0000
@@ -387,7 +387,7 @@
 extern int __libelf_fill_byte attribute_hidden;
 
 /* Nonzero if the version was set.  */
-extern int __libelf_version_initialized attribute_hidden;
+extern int __libelf_version_initialized /* attribute_hidden */;
 
 
 /* The libelf API does not have such a function but it is still useful.
--- elfutils-0.97/configure.ac	2006/08/14 23:04:23	1.1
+++ elfutils-0.97/configure.ac	2006/08/14 23:06:50
@@ -53,6 +53,8 @@
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 AM_GNU_GETTEXT([external])
+MKINSTALLDIRS="\$(SHELL) \$(top_srcdir)/config/mkinstalldirs"
+AC_SUBST(MKINSTALLDIRS)
 AC_PROG_RANLIB
 AC_PROG_YACC
 AM_PROG_LEX