[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.36, 1.37

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv

Modified Files:
	pkgadmin.mk 
Log Message:
Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime
on all platforms, and more on Solaris and HP-UX.
Use admserv10.jar as the console jar file name instead of the new format - will
change back once the new code is tagged.



Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pkgadmin.mk	1 Feb 2006 23:03:49 -0000	1.36
+++ pkgadmin.mk	13 Feb 2006 22:12:55 -0000	1.37
@@ -168,7 +168,7 @@
 
 # grab the jar files
 	cd $(ADMIN_JARS) ; \
-	   cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+	   cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
 
 #
 # Cleanup before making distributable zip
@@ -252,19 +252,6 @@
 	fi ; \
 	done
 
-# Cert System needs chk files [154431]
-	cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib
-# libfreebl_*.chk files only exist on the 32-bit builds.
-# They should be packaged only for the 32-bit builds.
-ifneq ($(USE_64), 1)
-ifeq ($(ARCH), SOLARIS)
-	cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib
-endif
-ifeq ($(ARCH), HPUX)
-	cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib
-endif
-endif
-
 # Copy LIB ADMIN UTIL
 	cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
 	for file in $(ADMINUTIL_SOLIBS); do \