summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bfd61f03c1c..f6883b266bc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-28 Tom Tromey <tromey@cygnus.com>
+
+ * Makefile.in: Rebuilt.
+ * Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP.
+
2000-01-26 Tom Tromey <tromey@cygnus.com>
* gcj/method.h (JvNumMethods): Moved from Class.h.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index a8765a24478..8b1143babab 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -87,7 +87,7 @@ endif
JCFLAGS = -g -L$(here)
JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@
-LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
+LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
$(GCINCS) $(THREADINCS) $(INCLTDL) \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f6818b36b51..2943f203637 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -170,7 +170,7 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ \
JCFLAGS = -g -L$(here)
JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@
-LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
+LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
$(GCINCS) $(THREADINCS) $(INCLTDL) \