[Fedora-directory-commits] ldapserver buildpaths.mk, 1.6, 1.7 internal_buildpaths.mk, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver

Modified Files:
	buildpaths.mk internal_buildpaths.mk 
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi at redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to 
dist/classes for internal builds.  For external builds, the developer 
can grab these jars from their respective locations, or grab the bundle 
from the fds download site, which is what the GAR builds will do.  The 
location is then passed in on the make command line as 
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars.  Regular internal builds 
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildpaths.mk	21 Oct 2005 19:21:04 -0000	1.6
+++ buildpaths.mk	27 Oct 2005 14:12:33 -0000	1.7
@@ -135,5 +135,8 @@
 # JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
 # JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
 # Crimson - crimson.jar - http://xml.apache.org/crimson/
+# Also the ldapjdk.jar
+# all of these files need to be in the following directory
+DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
 
 PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)


Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- internal_buildpaths.mk	3 Oct 2005 19:53:40 -0000	1.6
+++ internal_buildpaths.mk	27 Oct 2005 14:12:33 -0000	1.7
@@ -139,3 +139,5 @@
 ifndef ADMINSERVER_SOURCE_ROOT
 ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
 endif
+
+DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)