[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.46, 1.47

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	pkgadmin.mk 
Log Message:
Bug: 192785
Description: Admin Server: Move admin server console into a separate package
Reviewed by: Noriko (Thanks!)
Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles



Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- pkgadmin.mk	24 Mar 2006 19:13:11 -0000	1.46
+++ pkgadmin.mk	23 May 2006 22:13:36 -0000	1.47
@@ -42,7 +42,7 @@
 PKGTOP=$(PLATFORM_PACKAGE_DIR)
 PKGDIR=$(PLATFORM_PACKAGE_DIR)/admin
 
-ADMIN_JARS=$(BUILD_ROOT)/built/package/java/admin
+JAVA_PACKAGE_DIR=$(BUILD_ROOT)/built/package/java
 
 ADM_CORE=$(DIR)
 ADM_CLIENT=client
@@ -155,10 +155,10 @@
 # grab the jar files
 ifeq ($(ARCH), WINNT)
 # no symlink on Windows
-	cd $(ADMIN_JARS) ; \
+	cd $(ADMSERVCONSOLE_JAR_DIR) ; \
 	cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
 else
-	cd $(ADMIN_JARS) ; \
+	cd $(ADMSERVCONSOLE_JAR_DIR) ; \
 	cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars; \
 	(cd $(CLIENT_DIR)/java/jars; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF).jar; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF)_en.jar)
 endif
@@ -271,9 +271,9 @@
 	cd $(ADMSERV_OBJDIR)/cmdln; \
 	cp -p admconfig $(ADMIN_DIR)/bin/admin;
 
-	cd $(ADMIN_JARS)/.. ; \
+	cd $(JAVA_PACKAGE_DIR) ; \
 	   find *.html *.gif *.jpg | $(CPIO) $(ADMIN_DIR)/java/html
-	cd $(ADMIN_JARS)/.. ; \
+	cd $(JAVA_PACKAGE_DIR)/.. ; \
 	   find *.html | $(CPIO) $(ADMIN_DIR)/java/html/en
 endif # NOJAVA