From: Tom Tromey <tromey@redhat.com>
Date: Thu, 22 Aug 2002 00:52:20 +0000 (+0000)
Subject: re PR libgcj/7633 ($(prefix)/share used rather than $(datadir))
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79a3cb188568485ae45293135d8fcf99ca95ab60;p=gcc.git

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
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7535b5f9e10..72e1603f163 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 50f811bb470..fc0e40b5161 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)