Author: glen Date: Mon May 22 14:21:51 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- %{_libdir} as per qboosh suggestion
---- Files affected:
SOURCES:
rpm.macros (1.295 -> 1.296)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.295 SOURCES/rpm.macros:1.296
--- SOURCES/rpm.macros:1.295 Mon May 22 16:19:48 2006
+++ SOURCES/rpm.macros Mon May 22 16:21:46 2006
@@ -811,17 +811,17 @@
# java macros. based on jpackage macros.java
-%_jvmdir %{_prefix}/lib/jvm
-%_jvmjardir %{_prefix}/lib/jvm-exports
-%_jvmprivdir %{_prefix}/lib/jvm-private
-%_jvmlibdir %{_prefix}/lib/jvm
+%_jvmdir %{_libdir}/jvm
+%_jvmjardir %{_libdir}/jvm-exports
+%_jvmprivdir %{_libdir}/jvm-private
+%_jvmlibdir %{_libdir}/jvm
%_jvmdatadir %{_datadir}/jvm
%_jvmsysconfdir %{_sysconfdir}/jvm
-%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon
+%_jvmcommonlibdir %{_libdir}/jvm-commmon
%_jvmcommondatadir %{_datadir}/jvm-commmon
%_jvmcommonsysconfdir %{_sysconfdir}/jvm-commmon
%_javadir %{_datadir}/java
-%_jnidir %{_prefix}/lib/java
+%_jnidir %{_libdir}/java
%_javadocdir %{_datadir}/javadoc
%java_home %(unset JAVA_HOME; . %{_javadir}-utils/java-functions;
set_jvm; echo $JAVA_HOME)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.295&r2=1.296&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
