1 files changed, 4 insertions, 11 deletions
diff --git a/pki/base/console/build.xml b/pki/base/console/build.xml
index f79babca0..5a7257d38 100644
--- a/pki/base/console/build.xml
+++ b/pki/base/console/build.xml
@@ -28,12 +28,12 @@
     <property name="mcc_en.jar" value="${jar.home}/idm-console-mcc_en.jar"/>
     <property name="nmclf.jar" value="${jar.home}/idm-console-nmclf.jar"/>
     <property name="nmclf_en.jar" value="${jar.home}/idm-console-nmclf_en.jar"/>
-    <property name="nsutil.jar" value="${pki-jar.home}/nsutil.jar"/>
+    <property name="pki-nsutil.jar" value="${pki-jar.home}/pki-nsutil.jar"/>
 
     <path id="classpath">
         <pathelement location="${jss.jar}"/>
         <pathelement location="${ldapjdk.jar}"/>
-        <pathelement location="${nsutil.jar}"/>
+        <pathelement location="${pki-nsutil.jar}"/>
         <pathelement location="${base.jar}"/>
         <pathelement location="${mcc.jar}"/>
         <pathelement location="${mcc_en.jar}"/>
@@ -91,11 +91,6 @@
                 <include name="com/netscape/**"/>
             </fileset>
         </jar>
-        <jar jarfile="${build.jars}/pki-console-${version}_en.jar">
-            <fileset dir=".">
-                <include name="CMSAdminRS.properties"/>
-            </fileset>
-        </jar>
         <echo message="${end.build.jars.log.message}"/>
     </target>
 
@@ -185,7 +180,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="./build"
@@ -207,7 +202,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="./build"
@@ -265,7 +260,6 @@
                 <include name="EULA"/>
                 <include name="LICENSE"/>
                 <include name="build.xml"/>
-                <include name="CMSAdminRS.properties"/>
                 <include name="config/product*.xml"/>
                 <include name="config/release*.xml"/>
                 <include name="release"/>
@@ -285,7 +279,6 @@
                 <include name="EULA"/>
                 <include name="LICENSE"/>
                 <include name="build.xml"/>
-                <include name="CMSAdminRS.properties"/>
                 <include name="config/product*.xml"/>
                 <include name="config/release*.xml"/>
                 <include name="release"/>