[Fedora-directory-commits] adminserver/admserv/newinst/insadm Makefile, 1.13, 1.14

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	Makefile 
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	29 Sep 2005 22:12:00 -0000	1.13
+++ Makefile	24 Mar 2006 01:13:08 -0000	1.14
@@ -315,8 +315,8 @@
 	-rm $(STARTCONZDIR)/console.z
 	mkdir -p $(STARTCONZDIR)/java/jars
 	mkdir -p $(STARTCONZDIR)/bin/base
-	cp $(ADMIN_JARS)/admserv$(ADM_SUF).jar $(STARTCONZDIR)/java/jars
-	cp $(ADMIN_JARS)/admserv$(ADM_SUF)_en.jar $(STARTCONZDIR)/java/jars
+	cp $(ADMIN_JARS)/$(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(STARTCONZDIR)/java/jars
+	cp $(ADMIN_JARS)/$(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(STARTCONZDIR)/java/jars
 	cp $(SRC_ADMSERV)/viewurl.exe $(STARTCONZDIR)/bin/base
 	cp $(SRC_ADMSERV)/jre.inf $(STARTCONZDIR)/java
 	cd $(STARTCONZDIR) ; $(ZIP) -r console.z '*'