* CLASSPATH_INSTALL_DIR: Renamed to CLASSPATH_PREFIX.

diff --git a/contrib/setenvinstalled.in b/contrib/setenvinstalled.in
index 2001be7b0a2ac1c8be6407c43a390675be85f792..6a95338519cf3dcb91d3d0e2271133a7e4518d8a 100644 (file)
--- a/contrib/setenvinstalled.in
+++ b/contrib/setenvinstalled.in
@@ -1,5 +1,5 @@
 # sets the environment variables when GNU classpath is installed, but
 # CACAO not
 
-export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_INSTALL_DIR@/share/classpath/glibj.zip
+export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_PREFIX@/share/classpath/glibj.zip
 export PATH=$PWD/src/cacao:$PATH

diff --git a/contrib/setenvsource.in b/contrib/setenvsource.in
index 4c94da51f1328b0c472759a4a070354a45c85671..8c6e6d864ff72cd4fb9bf663bfccaba800526965 100644 (file)
--- a/contrib/setenvsource.in
+++ b/contrib/setenvsource.in
@@ -2,14 +2,14 @@
 # installed
 
 export LD_LIBRARY_PATH=\
-@CLASSPATH_INSTALL_DIR@/native/jawt/.libs:\
-@CLASSPATH_INSTALL_DIR@/native/jni/gtk-peer/.libs:\
-@CLASSPATH_INSTALL_DIR@/native/jni/java-io/.libs:\
-@CLASSPATH_INSTALL_DIR@/native/jni/java-lang/.libs:\
-@CLASSPATH_INSTALL_DIR@/native/jni/java-net/.libs:\
-@CLASSPATH_INSTALL_DIR@/native/jni/java-nio/.libs:\
-@CLASSPATH_INSTALL_DIR@/native/jni/java-util/.libs:\
+@CLASSPATH_PREFIX@/native/jawt/.libs:\
+@CLASSPATH_PREFIX@/native/jni/gtk-peer/.libs:\
+@CLASSPATH_PREFIX@/native/jni/java-io/.libs:\
+@CLASSPATH_PREFIX@/native/jni/java-lang/.libs:\
+@CLASSPATH_PREFIX@/native/jni/java-net/.libs:\
+@CLASSPATH_PREFIX@/native/jni/java-nio/.libs:\
+@CLASSPATH_PREFIX@/native/jni/java-util/.libs:\
 $LD_LIBRARY_PATH
 
-export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_INSTALL_DIR@/lib/glibj.zip
+export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_PREFIX@/lib/glibj.zip
 export PATH=$PWD/src/cacao:$PATH

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 782741773b9ac2a1ca6fe0805a914821c957f207..6b72b56c03b5a6e3c5a2cb6c5ece7e8ec28e192e 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4039 2006-01-01 19:39:30Z twisti $
+## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -59,12 +59,12 @@ cacao_LDFLAGS = \
        $(LTLIBICONV)
 
 CLASSPATH_LIBS = \
-       $(CLASSPATH_INSTALL_DIR)/lib/classpath/libjavaio.a \
-       $(CLASSPATH_INSTALL_DIR)/lib/classpath/libjavanio.a \
-       $(CLASSPATH_INSTALL_DIR)/lib/classpath/libjavanet.a \
-       $(CLASSPATH_INSTALL_DIR)/lib/classpath/libjavautil.a \
-       $(CLASSPATH_INSTALL_DIR)/lib/classpath/libjavalang.a \
-       $(CLASSPATH_INSTALL_DIR)/lib/classpath/libjavalangreflect.a
+       $(CLASSPATH_PREFIX)/classpath/libjavaio.a \
+       $(CLASSPATH_PREFIX)/classpath/libjavanio.a \
+       $(CLASSPATH_PREFIX)/classpath/libjavanet.a \
+       $(CLASSPATH_PREFIX)/classpath/libjavautil.a \
+       $(CLASSPATH_PREFIX)/classpath/libjavalang.a \
+       $(CLASSPATH_PREFIX)/classpath/libjavalangreflect.a
 
 #if USE_GTK_PEER
 #cacao_CFLAGS = \
@@ -76,7 +76,7 @@ CLASSPATH_LIBS = \
 #      $(XML_LIBS) $(XSLT_LIBS)
 #
 #CLASSPATH_LIBS += \
-#      $(CLASSPATH_INSTALL_DIR)/lib/classpath/libgtkpeer.a
+#      $(CLASSPATH_PREFIX)/classpath/libgtkpeer.a
 #endif
 
 else

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a37f78d9f6b307b985187e645836829264e59073..81e1d2691fc39ac57d007c0242654c0fc91d5fb2 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4202 2006-01-13 18:51:10Z twisti $
+## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -45,7 +45,7 @@ JAVA_VM_FILES = \
        $(top_srcdir)/src/lib/vm/reference/java/lang/VMThrowable.java \
        $(top_srcdir)/src/lib/vm/reference/java/security/VMAccessController.java
 
-GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
+GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
 pkgdata_DATA = vm.zip
 

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index a894c0225a9f9c357f4bf8de352c47673ccf911e..ae3de7570a42e79e5dfb76ae39a41a6cf53d6d65 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
+## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -49,8 +49,8 @@ CLEANFILES += nativetable.inc
 
 $(srcdir)/native.c: nativetable.inc
 
-nativetable.inc: $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable
-       BOOTCLASSPATH=$(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable > $(top_builddir)/src/native/nativetable.inc
+nativetable.inc: $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable
+       BOOTCLASSPATH=$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable > $(top_builddir)/src/native/nativetable.inc
 endif
 
 noinst_LTLIBRARIES = libnative.la

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 03f165525ad681be304c7d428d84f1cff6099eb8..ae2d902d0b856e9047aa104f19e0aa7c32582215 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,12 +28,12 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4094 2006-01-08 19:14:17Z twisti $
+## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
 EXTRA_DIST = \
        Test.sh \