fix relative pathes

diff --git a/Makefile.am b/Makefile.am
index b81c499d98dd456e95e7934d7a4403ab7a27b37f..f482cde803da310cdf3681e1fcdf38251513e35d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 884 2004-01-15 21:39:01Z jowenn $
+# $Id: Makefile.am 885 2004-01-16 07:25:13Z jowenn $
 
 @SET_MAKE@
 
@@ -55,12 +55,12 @@ cacao_LDADD = \
        nat/libnat.a \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
-       classpathbin/@ARCH_DIR@/native/jni/java-io/.libs/libjavaio.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-nio/.libs/libjavanio.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-net/.libs/libjavanet.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-util/.libs/libjavautil.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-lang/.libs/libjavalang.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-lang/.libs/libjavalangreflect.a \
+       gnuclasspathnat/native/jni/java-io/.libs/libjavaio.a \
+       gnuclasspathnat/native/jni/java-nio/.libs/libjavanio.a \
+       gnuclasspathnat/native/jni/java-net/.libs/libjavanet.a \
+       gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
        @AWT_OBJS@ \
        @ZIP_LIBS@
 
@@ -73,12 +73,12 @@ cacao_DEPENDENCIES = \
        nat/libnat.a \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
-       classpathbin/@ARCH_DIR@/native/jni/java-io/.libs/libjavaio.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-nio/.libs/libjavanio.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-net/.libs/libjavanet.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-util/.libs/libjavautil.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-lang/.libs/libjavalang.a \
-       classpathbin/@ARCH_DIR@/native/jni/java-lang/.libs/libjavalangreflect.a \
+       gnuclasspathnat/native/jni/java-io/.libs/libjavaio.a \
+       gnuclasspathnat/native/jni/java-nio/.libs/libjavanio.a \
+       gnuclasspathnat/native/jni/java-net/.libs/libjavanet.a \
+       gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
        @AWT_OBJS@ \
        @ZIP_LIBS@
 
@@ -102,7 +102,7 @@ cacaoh_DEPENDENCIES = \
 
 nativetypes.hh jit/@ARCH_DIR@/offsets.h nativetable.hh: cacaoh Makefile.am Makefile
        test -f stamp-nat || \
-       CLASSPATH=./classpathbin/@ARCH_DIR@/lib ./cacaoh \
+       CLASSPATH=./gnuclassfiles ./cacaoh \
        java.lang.String \
        java.lang.Class \
        java.io.FileDescriptor \

diff --git a/configure.in b/configure.in
index 614471cadb474c7ebc75e001bc07d171c2009c51..3dfe0ed03f0d5f1279fb62386752e5344396e00b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -252,7 +252,7 @@ if test x"$enable_gtkpeer" = "xyes"; then
                gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer \
                gnu.java.awt.peer.gtk.GtkClipboard \
                gnu.java.awt.peer.gtk.GtkWindowPeer"
-               AWT_OBJS="classpathbin/$ARCH_DIR/native/jni/gtk-peer/.libs/libgtkpeer.a \
+               AWT_OBJS="gnuclasspathnat/native/jni/gtk-peer/.libs/libgtkpeer.a \
                        -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 \
                        -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 \
                        -lgthread-2.0 -lart_lgpl_2"
@@ -287,8 +287,7 @@ AC_OUTPUT(Makefile \
           doc/Makefile \
          tst/Makefile \
          tst/kaffe/Makefile \
-         jvmtst/Makefile \
-          classpathbin/Makefile)
+         jvmtst/Makefile )
 
 
 cd gnuclasspathnat