[Fedora-directory-commits] adminserver components.mk,1.45,1.46

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	components.mk 
Log Message:
Picking up new console.



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- components.mk	24 Mar 2006 04:19:49 -0000	1.45
+++ components.mk	24 Mar 2006 20:15:51 -0000	1.46
@@ -358,7 +358,7 @@
 
 NMCJDK_SUF =  1.0.2
 NMCJDK_GEN_SUF =  1.0
-NMCJDK_RELDATE = 20060323
+NMCJDK_RELDATE = 20060324
 
 NMCJDK_COMP = console/$(NMCJDK_GEN_SUF)
 
@@ -384,12 +384,14 @@
 	mkdir -p $(CLASS_DEST)
 # grab the jar files
 	$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR)/java -files $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar
+ifneq ($(ARCH), WINNT)
 # make symlinks; cannot FTP symlinked files
 	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-base-$(NMCJDK_GEN_SUF).jar)
 	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF).jar)
 	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar $(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF)_en.jar)
 	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF).jar)
 	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar $(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF)_en.jar)
+endif
 # grab the startconsole program
 	$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files startconsole && chmod +x $(CLASS_DEST)/startconsole
 else # INTERNAL_BUILD