re PR bootstrap/54623 (install fails with libbacktrace/backtrace.c:35:20: error:…

re PR bootstrap/54623 (install fails with libbacktrace/backtrace.c:35:20: error: unwind.h: No such file or directory)

	PR bootstrap/54623
	* Makefile.am (AM_CPPFLAGS): Define.
	(AM_CFLAGS): Remove -I options.
	* Makefile.in: Rebuild.

From-SVN: r191459

libbacktrace/ChangeLog

 2012-09-18  Ian Lance Taylor  <iant@google.com>
 
+	PR bootstrap/54623
+	* Makefile.am (AM_CPPFLAGS): Define.
+	(AM_CFLAGS): Remove -I options.
+	* Makefile.in: Rebuild.
+
+2012-09-18  Ian Lance Taylor  <iant@google.com>
+
 	* posix.c (O_BINARY): Define if not defined.
 	(backtrace_open): Pass O_BINARY to open.  Only call fcntl if
 	HAVE_FCNTL is defined.

libbacktrace/Makefile.am

@@ -31,7 +31,10 @@
 
 ACLOCAL_AMFLAGS = -I .. -I ../config
 
-AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG) -I $(srcdir)/../include -I ../libgcc
+AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
+	-I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include
+
+AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG)
 
 noinst_LTLIBRARIES = libbacktrace.la
 

libbacktrace/Makefile.in

@@ -256,7 +256,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I .. -I ../config
-AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG) -I $(srcdir)/../include -I ../libgcc
+AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
+	-I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include
+
+AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG)
 noinst_LTLIBRARIES = libbacktrace.la
 libbacktrace_la_SOURCES = \
 	backtrace.h \