Makefile.in: Rebuilt.

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

From-SVN: r97412

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bdd1246f76b59203a2fe3fbdd47f245672213acb..996c32a1420d907af4d38adb5ff9a883c1caafa8 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 1694560a678f1d6acc19e9f25e82730e4dcf9e49..f2d197a0b4d9bd44463b8d56ac8c68c9681a3cb7 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 d91dcf23fe2772ec8f5383cc257bdfe4e04b6f52..51787c93968e335e66f0ba6c81f71e9e60279b10 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