[Fedora-directory-commits] adminserver nsconfig.mk,1.18,1.19

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	nsconfig.mk 
Log Message:
put the Apache modules back into the packaging - the gpl is compatible with the apl in this specific instance - also enable using ant and java from PATH by default for external builds


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nsconfig.mk	3 Nov 2005 23:20:38 -0000	1.18
+++ nsconfig.mk	16 Nov 2005 03:18:24 -0000	1.19
@@ -30,12 +30,18 @@
 ABS_ROOT := $(shell cd $(BUILD_ROOT)/..; pwd)
 NSROOT = $(BUILD_ROOT)
 
+ifdef INTERNAL_BUILD
 # the directory containing pre-built binary components for use during
 # building and packaging, including Red Hat branded components
 COMPONENTS_DIR = /share/builds/components
 INT_DIR = /share/builds/sbsintegration
 # these are Fedora branded components - only a few components are branded
 FED_COMPONENTS_DIR = /fedora/components
+else
+# just set these by default
+GET_JAVA_FROM_PATH := 1
+GET_ANT_FROM_PATH := 1
+endif
 
 include $(NSROOT)/nsdefs.mk