[patch] Fix path of the classmap.db file

[patch] Fix path of the classmap.db file

[Matthias Klose]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

Andrew Haley pointed out that gcj-dbtool -p doesn't work correctly, this is due
to a wrong macro LIBGCJ_DEFAULT_DATABASE_TAIL, having a wrong gcj subdirectory
encoded. The LIBGCJ_DEFAULT_DATABASE macro is already using the path.

Tested that the gcj-dbtool built with this patch uses the correct path.

Ok for the trunk and the 4.3 branch?

  Matthias


[-- Attachment #2: libjava.diff --]
[-- Type: text/x-diff, Size: 1018 bytes --]

2008-07-02  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Substitute gcjsubdir.
	* Makefile.am (db_pathtail): Use it.
	* Makefile.in, configure: Regenerate.
 
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 137349)
+++ libjava/configure.ac	(working copy)
@@ -1416,6 +1416,7 @@
    ;;
 esac
 AC_SUBST(dbexecdir)
+AC_SUBST(gcjsubdir)
 
 AC_DEFINE(JV_VERSION, "1.5.0", [Compatibility version string])
 AC_DEFINE(JV_API_VERSION, "1.5", [API compatibility version string])
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am	(revision 137349)
+++ libjava/Makefile.am	(working copy)
@@ -74,7 +74,8 @@
 ## Name of the default .db.
 db_name = classmap.db
 ## Compiler specific component of the .db file
-db_pathtail = gcj-$(gcc_version)/$(db_name)
+gcjsubdir = @gcjsubdir@
+db_pathtail = $(gcjsubdir)/$(db_name)
 
 ## For now, only on native systems.  FIXME.
 if NATIVE

Re: [patch] Fix path of the classmap.db file

[Andrew Haley]

Matthias Klose wrote:
> Andrew Haley pointed out that gcj-dbtool -p doesn't work correctly, this is due
> to a wrong macro LIBGCJ_DEFAULT_DATABASE_TAIL, having a wrong gcj subdirectory
> encoded. The LIBGCJ_DEFAULT_DATABASE macro is already using the path.
> 
> Tested that the gcj-dbtool built with this patch uses the correct path.
> 
> Ok for the trunk and the 4.3 branch?

OK for branch.  Please don't check into trunk as it's part of
another patch I'm working on.

Andrew.

Re: [patch] Fix path of the classmap.db file

[Tom Tromey]

>>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes:

Just FYI...

Matthias> Index: libjava/Makefile.am
[...]
Matthias> +gcjsubdir = @gcjsubdir@

Automake automatically adds all substs to the Makefile.in.

Tom