Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9783
Modified Files:
buildpaths.mk components.mk
Log Message:
Make the build/pull work like the adminserver does with respect to console. Otherwise,
dsbuild with recent code no longer works.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- buildpaths.mk 29 Mar 2006 19:42:39 -0000 1.13
+++ buildpaths.mk 8 Apr 2006 19:29:35 -0000 1.14
@@ -139,7 +139,7 @@
ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
-LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/../directoryconsole
+LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/..
# these are the files needed to build the java components - xmltools and dsmlgw -
# and where to get them
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- components.mk 7 Apr 2006 22:19:35 -0000 1.46
+++ components.mk 8 Apr 2006 19:29:35 -0000 1.47
@@ -569,7 +569,7 @@
ADMINSERVER_SUBCOMPS:=admin base
ifdef LDAPCONSOLE_SOURCE_ROOT
- LDAPCONSOLE_DIR = $(ABS_ROOT)/../built/package
+ LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
else
LDAPCONSOLE_DIR = $(CLASS_DEST)
endif