summaryrefslogtreecommitdiffstats
path: root/components.mk
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-02-28 03:00:14 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-02-28 03:00:14 +0000
commit2ab1b4d64d3d2a718bade5161c2ec2c834111f7b (patch)
tree7458e68e56824d534f349c87bc51c3c23caeee16 /components.mk
parent0402bb5e22f9c422ce2942d0c07735aee76fe1f4 (diff)
downloadds-2ab1b4d64d3d2a718bade5161c2ec2c834111f7b.tar.gz
ds-2ab1b4d64d3d2a718bade5161c2ec2c834111f7b.tar.xz
ds-2ab1b4d64d3d2a718bade5161c2ec2c834111f7b.zip
Fixing nightly build
Changes: 1) NSPR_RELDATE: v4.6.1 --> v4.6 2) ICU_LIB_VERSION: 34 --> 24 This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4. 3) lib/base/systhr.cpp: Applied NSPR sysfd table patch 4) DS version: 7.1 --> 7.2
Diffstat (limited to 'components.mk')
-rw-r--r--components.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/components.mk b/components.mk
index 464110cf..31b39b2e 100644
--- a/components.mk
+++ b/components.mk
@@ -439,7 +439,7 @@ endif
### ICU package ##########################################
-ICU_LIB_VERSION = 34
+ICU_LIB_VERSION = 24
ifdef ICU_SOURCE_ROOT
ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
@@ -589,7 +589,7 @@ ifdef ADMINSERVER_SOURCE_ROOT
# else set in internal_buildpaths.mk
endif
# these are the subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base setup.inf
+ADMINSERVER_SUBCOMPS=admin base
ifdef LDAPCONSOLE_SOURCE_ROOT
LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package