re PR libgcj/26522 (gcc-4.1.0-RC{1,2} install headers into a top-level (root) /include)

	PR libgcj/26522:
	* Makefile.in: Rebuilt.
	* Makefile.am (libsubdir): New variable.

From-SVN: r112925

libjava/ChangeLog

+2006-04-13  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/26522:
+	* Makefile.in: Rebuilt.
+	* Makefile.am (libsubdir): New variable.
+
 2006-04-12  NAKATA Maho  <maho@FreeBSD.org> 
 
 	PR libgcj/23829

libjava/Makefile.am

@@ -26,6 +26,9 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o
 # autoconf2.13's target_alias
 target_noncanonical = @target_noncanonical@
 
+# This is required by TL_AC_GXX_INCLUDE_DIR.
+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+
 ##
 ## What gets installed, and where.
 ##

libjava/Makefile.in

@@ -666,6 +666,9 @@ SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1)
 # $(1): variable containing entries to iterate over
 # $(2): output file
 write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2)))
+
+# This is required by TL_AC_GXX_INCLUDE_DIR.
+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
 toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) \
 	$(am__append_3) $(am__append_4)
 toolexecmainlib_DATA = libgcj.spec