[Fedora-directory-commits] adminserver buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.15, 1.16

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	buildpaths.mk nsconfig.mk 
Log Message:
by default, use the console ldapjdk.jar and JSS for building and packaging admin server


Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk	6 Oct 2005 03:12:57 -0000	1.2
+++ buildpaths.mk	7 Oct 2005 21:49:29 -0000	1.3
@@ -90,10 +90,12 @@
 MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
 #MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
 
-LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
 
-JSS_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk
 
-CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
+#JSS_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+JSS_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/jss
 
 ONLINEHELP_SOURCE_DIR = $(BUILD_ROOT)/../onlinehelp


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsconfig.mk	6 Oct 2005 03:12:57 -0000	1.15
+++ nsconfig.mk	7 Oct 2005 21:49:29 -0000	1.16
@@ -873,8 +873,12 @@
 ifdef LDAPJDK_SOURCE_DIR
   LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
 else
+ifdef LDAPJDK_BUILD_DIR
+  LDAPJDK_DIR = $(LDAPJDK_BUILD_DIR)
+else
   LDAPJDK_DIR = $(CLASS_DEST)
 endif
+endif
 
 #########################################
 # JSS - jar and shared library
@@ -888,7 +892,11 @@
   endif
   JSS_LIBPATH = $(JSS_SOURCE_DIR)/dist/$(MOZ_OBJDIR_NAME)/lib
 else
+ifdef INTERNAL_BUILD
   JSS_JAR_DIR = $(CLASS_DEST)
+else
+  JSS_JAR_DIR = $(JSS_BUILD_DIR)
+endif
   JSS_LIBPATH = $(JSS_BUILD_DIR)/lib
   JSS_JAR_NAME = xpclass.jar
 endif