* Makefile.in: Rebuilt.

	* Makefile.am (db_pathtail): Use $(gcc_version), not
	@gcc_version@.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97412 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bdd1246..996c32a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-01  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (db_pathtail): Use $(gcc_version), not
+       @gcc_version@.
+
 2005-04-01  Jeroen Frijters  <jeroen@frijters.net>
 
        * java/util/Timer.java

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 1694560..f2d197a 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -131,7 +131,7 @@ dbexecdir = $(libdir)/gcj-$(gcc_version)
 ## Name of the default .db.
 db_name = classmap.db
 ## Compiler specific component of the .db file
-db_pathtail = gcj-@gcc_version@/$(db_name)
+db_pathtail = gcj-$(gcc_version)/$(db_name)
 
 ## For now, only on native systems.  FIXME.
 if NATIVE

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index d91dcf2..51787c9 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -4547,7 +4547,7 @@ secdir = $(libdir)/security
 propdir = $(libdir)
 dbexecdir = $(libdir)/gcj-$(gcc_version)
 db_name = classmap.db
-db_pathtail = gcj-@gcc_version@/$(db_name)
+db_pathtail = gcj-$(gcc_version)/$(db_name)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
 bin_SCRIPTS = addr2name.awk
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated