diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-04-08 19:29:35 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-04-08 19:29:35 +0000 |
| commit | 9545e36805201ac0e3172b762373c6df741c2721 (patch) | |
| tree | 28fe4925314dd31ab3481ebba26b0ce100cd1b98 | |
| parent | ef8cf93e817364e0ddab2bf89d5ddb4f8e0fd6fe (diff) | |
| download | ds-9545e36805201ac0e3172b762373c6df741c2721.tar.gz ds-9545e36805201ac0e3172b762373c6df741c2721.tar.xz ds-9545e36805201ac0e3172b762373c6df741c2721.zip | |
Make the build/pull work like the adminserver does with respect to console. Otherwise, dsbuild with recent code no longer works.
| -rw-r--r-- | buildpaths.mk | 2 | ||||
| -rw-r--r-- | components.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/buildpaths.mk b/buildpaths.mk index 7b24e51c..4b77c69f 100644 --- a/buildpaths.mk +++ b/buildpaths.mk @@ -139,7 +139,7 @@ SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil 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 diff --git a/components.mk b/components.mk index 8951de80..32fc01fe 100644 --- a/components.mk +++ b/components.mk @@ -569,7 +569,7 @@ ADMINSERVER_PKG:=admserv.tar.gz 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 |