Index: libraries/javalib/Makefile.in =================================================================== RCS file: /cvs/kaffe/kaffe/libraries/javalib/Makefile.in,v retrieving revision 1.372 diff -u -r1.372 Makefile.in --- libraries/javalib/Makefile.in 8 Jan 2005 19:25:15 -0000 1.372 +++ libraries/javalib/Makefile.in 9 Jan 2005 15:28:37 -0000 @@ -399,7 +399,7 @@ KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/:$(top_builddir)/libraries/clib/security/:$(top_builddir)/libraries/clib/classpath/ BOOTCLASSPATH = $(LIBDIR):$(srcdir)/Klasses.jar.bootstrap JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar -LD_LIBRARY_PATH = $(top_builddir)/libraries/clib/classpath/ +DYLD_LIBRARY_PATH = $(top_builddir)/libraries/clib/classpath/ jrelib_DATA = \ rt.jar \ logging.properties @@ -5781,7 +5781,7 @@ build-classes Klasses: rt.jar all-am: rebuildLib -export JIKES top_builddir LIBDIR srcdir LD_LIBRARY_PATH +export JIKES top_builddir LIBDIR srcdir DYLD_LIBRARY_PATH # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: Makefile.in =================================================================== RCS file: /cvs/kaffe/kaffe/Makefile.in,v retrieving revision 1.191 diff -u -r1.191 Makefile.in --- Makefile.in 22 Dec 2004 19:04:37 -0000 1.191 +++ Makefile.in 9 Jan 2005 15:30:56 -0000 @@ -974,7 +974,9 @@ echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ - echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new + echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \ + echo DYLD_LIBRARYPATH=$(top_builddir)/libraries/clib/classpath/.libs; export DYLD_LIBRARY_PATH > BUILD_ENVIRONMENT.new; \ + echo LD_LIBRARYPATH=$(top_builddir)/libraries/clib/classpath/.libs; export LD_LIBRARY_PATH > BUILD_ENVIRONMENT.new rm -f BUILD_ENVIRONMENT mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT