diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-04-13 21:04:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-04-13 21:04:04 +0000 |
| commit | eec69c4eca0201af80e1c40fe474fca89f890a82 (patch) | |
| tree | 7634d8f87513e37e815791bdc971fa03603ae23f | |
| parent | 7649275376cde27f3076060ad7246b2597c44eef (diff) | |
| download | gcc-eec69c4eca0201af80e1c40fe474fca89f890a82.zip gcc-eec69c4eca0201af80e1c40fe474fca89f890a82.tar.gz gcc-eec69c4eca0201af80e1c40fe474fca89f890a82.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/Makefile.in | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 227d72c..0622530 100644 --- 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 8b4b66b..150f8f1 100644 --- 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 3398033..f7b2a14 100644 --- 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 |