Author: glen Date: Fri Oct 3 19:19:26 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- pass CLASSPATH to %ant so wouldn't need to export it
---- Files affected:
SOURCES:
rpm.macros (1.479 -> 1.480)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.479 SOURCES/rpm.macros:1.480
--- SOURCES/rpm.macros:1.479 Sun Sep 7 12:40:37 2008
+++ SOURCES/rpm.macros Fri Oct 3 21:19:20 2008
@@ -1015,7 +1015,7 @@
%java_home %{expand:%%global java_home %([ -f
%{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVA_HOME;
. %{_javadir}-utils/java-functions; set_jvm; echo
${JAVA_HOME:-ERROR})}%java_home
-%ant JAVA_HOME=%{java_home} ant
+%ant JAVA_HOME=%{java_home} CLASSPATH=$CLASSPATH ant
%jar %{java_home}/bin/jar
%java %{expand:%%global java %([ -f
%{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVACMD; .
%{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)}%java
%javac %{java_home}/bin/javac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.479&r2=1.480&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
