[Fedora-directory-commits] adminserver components.mk,1.36,1.37

Nathan Kinder (nkinder) fedora-directory-commits at redhat.com
Tue Oct 25 15:29:09 UTC 2005


Author: nkinder

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

Modified Files:
	components.mk 
Log Message:
171667 - Pick up new console component and enable fedora component pulling


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- components.mk	6 Oct 2005 03:12:57 -0000	1.36
+++ components.mk	25 Oct 2005 15:29:07 -0000	1.37
@@ -314,17 +314,21 @@
 #############################################################
 
 NMCJDK_SUF =  71
-NMCJDK_RELDATE = 20050831
+NMCJDK_RELDATE = 20051024
 
 NMCJDK_COMP = console/7.1
 
 NMCJDK_VERSION = $(NMCJDK_RELDATE)
 
+ifeq ($(BUILD_MODE), int)
 ifeq ($(INT_NMCSDK), 1)
 BASE_NMCSDK = $(INT_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
 else
 BASE_NMCSDK = $(COMPONENTS_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
 endif
+else #fedora
+BASE_NMCSDK = $(FED_COMPONENTS_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
+endif
 
 NMCJDK_DIR = $(BASE_NMCSDK)/java
 




More information about the Fedora-directory-commits mailing list