summaryrefslogtreecommitdiffstats
path: root/pki/base/ca/build.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/ca/build.xml')
-rw-r--r--pki/base/ca/build.xml26
1 files changed, 13 insertions, 13 deletions
diff --git a/pki/base/ca/build.xml b/pki/base/ca/build.xml
index 0c2866abe..f81c15107 100644
--- a/pki/base/ca/build.xml
+++ b/pki/base/ca/build.xml
@@ -27,24 +27,24 @@
<property name="ldapjdk.jar" value="${jar.home}/ldapjdk.jar"/>
<property name="servlet.jar" value="${jar.home}/servlet.jar"/>
<property name="velocity.jar" value="${jar.home}/velocity.jar"/>
- <property name="certsrv.jar" value="${pki-jar.home}/certsrv.jar"/>
- <property name="cms.jar" value="${pki-jar.home}/cms.jar"/>
- <property name="cmscore.jar" value="${pki-jar.home}/cmscore.jar"/>
- <property name="cmsutil.jar" value="${pki-jar.home}/cmsutil.jar"/>
- <property name="nsutil.jar" value="${pki-jar.home}/nsutil.jar"/>
+ <property name="pki-certsrv.jar" value="${pki-jar.home}/pki-certsrv.jar"/>
+ <property name="pki-cms.jar" value="${pki-jar.home}/pki-cms.jar"/>
+ <property name="pki-cmscore.jar" value="${pki-jar.home}/pki-cmscore.jar"/>
+ <property name="pki-cmsutil.jar" value="${pki-jar.home}/pki-cmsutil.jar"/>
+ <property name="pki-nsutil.jar" value="${pki-jar.home}/pki-nsutil.jar"/>
<path id="classpath">
<pathelement location="${servlet.jar}"/>
<pathelement location="${jss.jar}"/>
<pathelement location="${ldapjdk.jar}"/>
- <pathelement location="${nsutil.jar}"/>
- <pathelement location="${cmsutil.jar}"/>
+ <pathelement location="${pki-nsutil.jar}"/>
+ <pathelement location="${pki-cmsutil.jar}"/>
<pathelement location="${osutil.jar}"/>
<pathelement location="${symkey.jar}"/>
<pathelement location="${velocity.jar}"/>
- <pathelement location="${cms.jar}"/>
- <pathelement location="${certsrv.jar}"/>
- <pathelement location="${cmscore.jar}"/>
+ <pathelement location="${pki-cms.jar}"/>
+ <pathelement location="${pki-certsrv.jar}"/>
+ <pathelement location="${pki-cmscore.jar}"/>
</path>
<!-- Set up component-specific properties -->
@@ -95,7 +95,7 @@
description="--> generate jar files">
<echo message="${begin.build.jars.log.message}"/>
<mkdir dir="${build.jars}"/>
- <jar jarfile="${build.jars}/${product}.jar">
+ <jar jarfile="${build.jars}/pki-ca.jar">
<fileset dir="${build.classes}">
<include name="com/netscape/${product}/**"/>
</fileset>
@@ -184,7 +184,7 @@
<zip destfile="${dist.base.binaries}/${dist.name}.zip">
<zipfileset dir="./build/jars"
filemode="755"
- prefix="usr/share/java">
+ prefix="usr/share/java/${product.prefix}">
<include name="**"/>
</zipfileset>
<zipfileset dir="./setup"
@@ -218,7 +218,7 @@
destfile="${dist.base.binaries}/${dist.name}.tar">
<tarfileset dir="./build/jars"
mode="755"
- prefix="${dist.name}/usr/share/java">
+ prefix="${dist.name}/usr/share/java/${product.prefix}">
<include name="**"/>
</tarfileset>
<tarfileset dir="./setup"