summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-01 17:54:27 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-01 17:54:27 +0000
commita74502ce2de055943b18430267381b2f28927591 (patch)
tree1d4ad136bf299ce86ecb66e12e89fd3bbbb6f111 /libjava
parent573a8833461a8b87bbb67502f7bc0aa367962d17 (diff)
downloadppe42-gcc-a74502ce2de055943b18430267381b2f28927591.tar.gz
ppe42-gcc-a74502ce2de055943b18430267381b2f28927591.zip
* 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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bdd1246f76b..996c32a1420 100644
--- 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 1694560a678..f2d197a0b4d 100644
--- 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 d91dcf23fe2..51787c93968 100644
--- 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
OpenPOWER on IntegriCloud