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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 227d72c6973c01c37a7c53dda097cd3c85e16fa7..0622530d440419611a620adea932e6a88fe4f6f9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 8b4b66b64dad8afd2cfc07e33a596d688cfd6604..150f8f127db981afa0f6d093477d472a99e6b843 100644 (file)
--- a/libjava/Makefile.am
+++ b/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.
 ##

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 3398033bd7c322269a4babb91015bfddef47b22f..f7b2a14e4271fce32cf620a79712620f7127c340 100644 (file)
--- a/libjava/Makefile.in
+++ b/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