[Fedora-directory-commits] adminserver components.mk,1.39,1.40

[Nathan Kinder (nkinder)]

Author: nkinder

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

Modified Files:
	components.mk 
Log Message:
172812 - Don't overwrite ANT_HOME on on external builds.  Also don't package ant jarfiles in the console java directory.


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- components.mk	3 Nov 2005 23:20:38 -0000	1.39
+++ components.mk	9 Nov 2005 23:22:50 -0000	1.40
@@ -396,7 +396,11 @@
 ANTLAUNCHERJAR = ant-launcher.jar
 ANT_FILES = $(ANTJAR) $(ANTLAUNCHERJAR)
 ANT_RELEASE = $(COMPONENTS_DIR)
-ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
+ifdef INTERNAL_BUILD
+  ifndef GET_ANT_FROM_PATH
+    ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
+  endif
+endif
 ANT_DIR = $(ANT_HOME)/lib
 ANT_DEP = $(addprefix $(CLASS_DEST)/, $(ANT_FILES))
 ANT_CP = $(subst $(SPACE),$(PATH_SEP),$(ANT_DEP))