diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-13 02:50:45 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-13 02:50:45 +0000 |
| commit | 9eccf374c78ce34fd488792b3a1a82a2032bb162 (patch) | |
| tree | 805c4efbfb269884c3ddfc0f5edf58eb76a51e23 /pki/base/java-tools | |
| parent | 78a301689d984401ad7098049ddb2f6e5504d957 (diff) | |
| download | pki-9eccf374c78ce34fd488792b3a1a82a2032bb162.tar.gz pki-9eccf374c78ce34fd488792b3a1a82a2032bb162.tar.xz pki-9eccf374c78ce34fd488792b3a1a82a2032bb162.zip | |
Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2197 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools')
4 files changed, 34 insertions, 4 deletions
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt index 678671e7f..90fe31ae4 100644 --- a/pki/base/java-tools/src/CMakeLists.txt +++ b/pki/base/java-tools/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/pki/base/java-tools/templates/pki_java_command_wrapper.in index 3c804de3f..4136eeebb 100644 --- a/pki/base/java-tools/templates/pki_java_command_wrapper.in +++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/lib/java/dirsec/osutil.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/osutil.jar:${CP} +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in index ce54ed024..fe0262c8c 100644 --- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/lib/java/dirsec/osutil.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/osutil.jar:${CP} +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in index 38f46856e..333983a47 100644 --- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/lib/java/dirsec/osutil.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/osutil.jar:${CP} +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} |