This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: install libgcj-config.h someplace special
- From: Anthony Green <green at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: 10 Mar 2002 13:16:55 -0800
- Subject: Patch: install libgcj-config.h someplace special
libgcj-config.h is generated at configure time. Unfortunately it's installed
in the regular include dir. This patch moves it to a target and version
specific directory which is searched by g++.
Ok for trunk and branch?
2002-03-10 Anthony Green <green@redhat.com>
* configure.in (tool_include_dir): Define.
* configure: Rebuilt.
* gcj/Makefile.am: Install libgcj-config.h relative to
tool_include_dir.
* gcj/Makefile: Rebuilt.
Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.114.2.2
diff -c -r1.114.2.2 configure.in
*** configure.in 2002/03/06 19:12:43 1.114.2.2
--- configure.in 2002/03/10 21:04:07
***************
*** 433,438 ****
--- 433,447 ----
# We're in the tree with gcc, and need to include some of its headers.
GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
+ # Figure out where generated headers like libgcj-config.h get installed.
+ changequote(,)dnl
+ gcc_version_trigger=${srcdir}/../gcc/version.c
+ gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
+ gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+ tool_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include
+ changequote([,])dnl
+ AC_SUBST(tool_include_dir)
+
if test -n "${with_cross_host}"; then
# We are being configured with a cross compiler. AC_REPLACE_FUNCS
# may not work correctly, because the compiler may not be able to
Index: libjava/gcj/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gcj/Makefile.am,v
retrieving revision 1.3
diff -c -r1.3 Makefile.am
*** Makefile.am 2001/05/24 05:40:36 1.3
--- Makefile.am 2002/03/10 21:04:07
***************
*** 3,6 ****
AUTOMAKE_OPTIONS = foreign
gcjdir = $(includedir)/gcj
! gcj_HEADERS = array.h cni.h field.h javaprims.h method.h libgcj-config.h
--- 3,9 ----
AUTOMAKE_OPTIONS = foreign
gcjdir = $(includedir)/gcj
! gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
!
! toolgcjdir = @tool_include_dir@/gcj
! toolgcj_HEADERS = libgcj-config.h