Author: nhosoi

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

Modified Files: buildpaths.mk nsconfig.mk Log Message: Adjusted Admin Util and Console build path for the external build.

Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.4 +++ buildpaths.mk 23 Nov 2005 01:25:45 -0000 1.5 @@ -84,7 +84,7 @@ SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil #SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil

-CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console +CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/..

#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT) LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk

Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nsconfig.mk 16 Nov 2005 03:18:24 -0000 1.19 +++ nsconfig.mk 23 Nov 2005 01:25:45 -0000 1.20 @@ -793,7 +793,7 @@ ADMINUTIL_LIB_VERSION=10 ifdef ADMINUTIL_SOURCE_ROOT ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib - ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include + ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-1.0 else ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include