aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-08-22 00:52:20 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-08-22 00:52:20 +0000
commit79a3cb188568485ae45293135d8fcf99ca95ab60 (patch)
tree760d0992c4129a9c0165dfdb17f521f920fcda51 /gcc
parent57ce46bb22f5d56069e3648022a1d43dc858a790 (diff)
downloadgcc-79a3cb188568485ae45293135d8fcf99ca95ab60.zip
gcc-79a3cb188568485ae45293135d8fcf99ca95ab60.tar.gz
gcc-79a3cb188568485ae45293135d8fcf99ca95ab60.tar.bz2
re PR libgcj/7633 ($(prefix)/share used rather than $(datadir))
* Make-lang.in (java/jcf-path.o): Use $(datadir), not $(prefix)/share. For PR libgcj/7633. From-SVN: r56499
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog3
-rw-r--r--gcc/java/Make-lang.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7535b5f..72e1603 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,8 @@
2002-08-21 Tom Tromey <tromey@redhat.com>
+ * Make-lang.in (java/jcf-path.o): Use $(datadir), not
+ $(prefix)/share. For PR libgcj/7633.
+
For PR java/6005 and PR java/7611:
* lang.c (LANG_HOOKS_CAN_USE_BITFIELDS_P): New define.
(java_can_use_bit_fields_p): New function.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 50f811b..fc0e40b 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -330,7 +330,7 @@ java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H)
# jcf-path.o needs a -D.
java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
- -DLIBGCJ_ZIP_FILE='"$(prefix)/share/java/libgcj-$(version).jar"' \
+ -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
-DDEFAULT_TARGET_VERSION=\"$(version)\" \
$(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)