adapted for new directory structure

diff --git a/Makefile.am b/Makefile.am
index f5f8b0013802a7db02b5e0ad919dcff413b52f35..b81c499d98dd456e95e7934d7a4403ab7a27b37f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 834 2004-01-04 23:24:25Z twisti $
+# $Id: Makefile.am 884 2004-01-15 21:39:01Z jowenn $
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
 ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
-SUBDIRS = classpathbin $(ALLSUBDIRS)
+SUBDIRS = gnuclasspathnat $(ALLSUBDIRS)
 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \

diff --git a/configure.in b/configure.in
index 0d303f17eaa55e86f1a34768eee62f9f2f5f54f8..614471cadb474c7ebc75e001bc07d171c2009c51 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -291,15 +291,15 @@ AC_OUTPUT(Makefile \
           classpathbin/Makefile)
 
 
-cd classpathbin/$ARCH_DIR
+cd gnuclasspathnat
 echo "========================================================================"
-echo "calling: ../../gnuclasspath/configure --prefix=$prefix/classpath --with-$CCOMP=yes --enable-jni=yes --enable-gtk-peer=$USEGTK --enable-shared=no --enable-static=yes --with-zip=no --enable-portable-native-sync"
+echo "calling: ./gnuclasspathnat/configure --prefix=$prefix/classpath --with-$CCOMP=yes --enable-jni=yes --enable-gtk-peer=$USEGTK --enable-shared=no --enable-static=yes --with-zip=no --enable-portable-native-sync -enable-java=no"
 echo "========================================================================"
 
-../../gnuclasspath/configure --prefix=$prefix/classpath --with-$CCOMP=yes \
+./configure --prefix=$prefix/classpath --with-$CCOMP=yes \
         --enable-jni=yes --enable-gtk-peer=$USEGTK --enable-shared=no --enable-static=yes --with-zip=no \
-       --enable-portable-native-sync
-cd ../..
+       --enable-portable-native-sync -enable-java=no
+cd ..