--- a/bfd/Makefile.am	2012-03-06 14:00:33.229957572 +0000

+++ b/bfd/Makefile.am	2012-04-27 16:46:05.410974817 +0100

@@ -18,7 +18,7 @@

 bfdlibdir = @bfdlibdir@

 bfdincludedir = @bfdincludedir@

 bfdlib_LTLIBRARIES = libbfd.la

-bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h

+bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h

 else !INSTALL_LIBBFD

 # Empty these so that the respective installation directories will not be created.

 bfdlibdir =

--- a/bfd/Makefile.in	2012-03-06 14:00:32.952957600 +0000

+++ b/bfd/Makefile.in	2012-04-27 16:46:19.718975214 +0100

@@ -138,7 +138,8 @@

 	installcheck-recursive installdirs-recursive pdf-recursive \

 	ps-recursive uninstall-recursive

 am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \

-	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h

+	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h \

+	$(INCDIR)/demangle.h

 HEADERS = $(bfdinclude_HEADERS)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

   distclean-recursive maintainer-clean-recursive

@@ -331,7 +332,8 @@

 @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2)

 @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \

 @INSTALL_LIBBFD_TRUE@	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \

-@INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h $(am__append_2)

+@INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h $(INCDIR)/demangle.h \

+@INSTALL_LIBBFD_TRUE@	$(am__append_2)

 @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@

 @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la

 AM_CFLAGS = $(WARN_CFLAGS)