[kaffe] CVS kaffe (guilhem): Fixed BUILD_ENVIRONMENT generation.

[Kaffe CVS]

PatchSet 5834 
Date: 2005/01/10 20:08:03
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fixed BUILD_ENVIRONMENT generation.

        * Makefile.am: Fixed BUILD_ENVIRONMENT generation.

        * Makefile.in: Regenerated.

Members: 
	ChangeLog:1.3378->1.3379 
	Makefile.am:1.82->1.83 
	Makefile.in:1.192->1.193 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3378 kaffe/ChangeLog:1.3379
--- kaffe/ChangeLog:1.3378	Mon Jan 10 15:13:30 2005
+++ kaffe/ChangeLog	Mon Jan 10 20:08:03 2005
@@ -1,3 +1,9 @@
+2005-01-10  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* Makefile.am: Fixed BUILD_ENVIRONMENT generation.
+
+	* Makefile.in: Regenerated.
+
 2005-01-10  Ito Kazumitsu  < kaz at maczuka.gcd.org>
 
 	* kaffe/libraries/javalib/kaffe/io/KaffeCharset.java,
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.82 kaffe/Makefile.am:1.83
--- kaffe/Makefile.am:1.82	Mon Jan 10 07:14:25 2005
+++ kaffe/Makefile.am	Mon Jan 10 20:08:08 2005
@@ -139,8 +139,8 @@
 	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 LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export LD_LIBRARY_PATH; \
-	echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export DYLD_LIBRARY_PATH
+	echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
+	echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
 	rm -f BUILD_ENVIRONMENT
 	mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
 
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.192 kaffe/Makefile.in:1.193
--- kaffe/Makefile.in:1.192	Mon Jan 10 07:14:25 2005
+++ kaffe/Makefile.in	Mon Jan 10 20:08:08 2005
@@ -975,8 +975,8 @@
 	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 LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export LD_LIBRARY_PATH; \
-	echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export DYLD_LIBRARY_PATH
+	echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
+	echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\; export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
 	rm -f BUILD_ENVIRONMENT
 	mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT