aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite
diff options
context:
space:
mode:
authorRichard Sandiford <rsandifo@redhat.com>2004-12-03 11:15:25 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2004-12-03 11:15:25 +0000
commitdafb7f3f52bbc30f565060d5d63bc93614a97806 (patch)
treed40e8700152bef5f4900b894b253bb6daa770ae0 /libjava/testsuite
parentf4ed7d2144f6a1754e88e03a6529aa79b4da40e4 (diff)
downloadgcc-dafb7f3f52bbc30f565060d5d63bc93614a97806.zip
gcc-dafb7f3f52bbc30f565060d5d63bc93614a97806.tar.gz
gcc-dafb7f3f52bbc30f565060d5d63bc93614a97806.tar.bz2
re PR libgcj/7305 (Install path for libgcj header files)
PR libgcj/7305 * configure.ac: Use TL_AC_GXX_INCLUDE_DIR. * Makefile.am (install-data-local): Install headers into $(gxx_include_dir) rather than $(includedir). (AM_MAKEFLAGS): Pass down gxx_include_dir. * gcj/Makefile.am (gcjdir): Set to $(gxx_include_dir)/gcj. * include/Makefile.am (tool_include__HEADERS): Define this... (include_HEADERS): ...instead of this. * configure, aclocal.m4, Makefile.in, gcj/Makefile.in: Regenerate. * include/Makefile.in, testsuite/Makefile.in: Regenerate. From-SVN: r91682
Diffstat (limited to 'libjava/testsuite')
-rw-r--r--libjava/testsuite/Makefile.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index 36fdfee..4ba07e5 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -42,6 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
$(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/gcc-version.m4 \
+ $(top_srcdir)/../config/gxx-include-dir.m4 \
$(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lcmessage.m4 \
$(top_srcdir)/../config/lib-ld.m4 \
@@ -246,6 +247,7 @@ exec_prefix = @exec_prefix@
gcc_version = @gcc_version@
gcc_version_full = @gcc_version_full@
gcc_version_trigger = @gcc_version_trigger@
+gxx_include_dir = @gxx_include_dir@
here = @here@
host = @host@
host_alias = @host_alias@
@@ -258,6 +260,7 @@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@
+libstdcxx_incdir = @libstdcxx_incdir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@