diff options
| author | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-03 11:15:25 +0000 |
|---|---|---|
| committer | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-03 11:15:25 +0000 |
| commit | 0a2485f384059073c31082b0b2e32f6a9f337378 (patch) | |
| tree | d40e8700152bef5f4900b894b253bb6daa770ae0 /libjava/gcj | |
| parent | 05d851a15224454173b94f261a5806264fc72d3e (diff) | |
| download | gcc-0a2485f384059073c31082b0b2e32f6a9f337378.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91682 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gcj')
| -rw-r--r-- | libjava/gcj/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/gcj/Makefile.in | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libjava/gcj/Makefile.am b/libjava/gcj/Makefile.am index 313ff6ad2fa..961f1e86739 100644 --- a/libjava/gcj/Makefile.am +++ b/libjava/gcj/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ -gcjdir = $(includedir)/gcj +gcjdir = $(gxx_include_dir)/gcj gcj_HEADERS = array.h cni.h field.h javaprims.h method.h toolgcjdir = @tool_include_dir@/gcj diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 40820fe1004..dc528b02c46 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -45,6 +45,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 \ @@ -258,6 +259,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@ @@ -270,6 +272,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@ @@ -294,7 +297,7 @@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ toolexecmainlibdir = @toolexecmainlibdir@ AUTOMAKE_OPTIONS = foreign -gcjdir = $(includedir)/gcj +gcjdir = $(gxx_include_dir)/gcj gcj_HEADERS = array.h cni.h field.h javaprims.h method.h toolgcjdir = @tool_include_dir@/gcj toolgcj_HEADERS = libgcj-config.h |