* src/vm/global.h (CACAO_VM_ZIP_PATH): Set correctly for ifndef

[cacao.git] / src / native / Makefile.am

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index fe2403ae51d9e1fbc0d99f88ab2f7424a97bf566..c2170542dbf90f5ed1ea408807851b2d62b3ecbe 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,13 +28,15 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4413 2006-02-03 20:54:16Z twisti $
+## $Id: Makefile.am 4416 2006-02-03 22:03:30Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
 
-SUBDIRS = include vm
+SUBDIRS = \
+       include \
+       vm
 
 CLEANFILES =
 
@@ -61,7 +63,12 @@ libnative_la_LIBADD = \
        vm/libnativevm.la \
        $(JVMTI_LIB)
 
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
+if ENABLE_ZLIB
+VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_FILE)
+else
+VM_ZIP = $(top_builddir)/src/lib/classes/
+endif
+
 GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)