diff options
Diffstat (limited to 'internal_comp_deps.mk')
| -rw-r--r-- | internal_comp_deps.mk | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 2ed76168..f78d8db1 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -239,10 +239,11 @@ endif # DB_SOURCE_ROOT ######## The rest of these components are internal only (for now) # ADMINUTIL library ####################################### -ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE)$(SEC_SUFFIX) -ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} +ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE) +ADMINUTIL_BASE=adminsdk/$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} ADMSDKOBJDIR = $(FULL_RTL_OBJDIR) -ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +#ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) # this is the base directory under which the component's files will be found # during the build process ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil @@ -320,8 +321,9 @@ endif ### SETUPSDK ############################# # this is where the build looks for setupsdk components SETUP_SDK_BUILD_DIR = $(NSCP_DISTDIR)/setupsdk -SETUPSDK_VERSION = $(SETUP_SDK_RELDATE)$(SEC_SUFFIX) -SETUPSDK_RELEASE = $(COMPONENTS_DIR)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME) +SETUPSDK_VERSION = $(SETUP_SDK_RELDATE) +#SETUPSDK_RELEASE = $(COMPONENTS_DIR)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME) +SETUPSDK_RELEASE = $(COMPONENTS_DIR_DEV)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME) SETUPSDK_LIBPATH = $(SETUP_SDK_BUILD_DIR)/lib SETUPSDK_INCDIR = $(SETUP_SDK_BUILD_DIR)/include SETUPSDK_BINPATH = $(SETUP_SDK_BUILD_DIR)/bin @@ -627,7 +629,8 @@ ADMIN_REL_DATE = $(ADM_VERSION) ADMIN_FILE = admserv.tar.gz ADMIN_FILE_TAR = admserv.tar ADMSDKOBJDIR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ -IMPORTADMINSRV_BASE=$(COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE) +#IMPORTADMINSRV_BASE=$(COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE) +IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE) IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32) ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/admserv ADMSERV_DEP = $(ADMSERV_DIR)/setup$(EXE_SUFFIX) @@ -646,7 +649,7 @@ else endif endif -ADM_VERSION = $(ADM_RELDATE)$(SEC_SUFFIX) +ADM_VERSION = $(ADM_RELDATE) ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME) ifndef ADMSERV_PULL_METHOD @@ -669,3 +672,26 @@ endif exit 1 ; \ fi ### Admin Server END ###################################### + +### DOCS ################################# +ifeq ($(BUILD_MODE), int) +DSDOC_GUIDES = slapd_guides.zip +DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS),$(DSDOC_GUIDES) +else +DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS) +endif +DSDOC_DEP := $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) + +ifndef DSDOC_PULL_METHOD +DSDOC_PULL_METHOD = $(COMPONENT_PULL_METHOD) +endif + +$(DSDOC_DEP): $(NSCP_DISTDIR) + $(FTP_PULL) -method $(DSDOC_PULL_METHOD) \ + -objdir $(DSDOC_DIR) -componentdir $(DSDOC_RELEASE) \ + -files $(DSDOC_FILES) + @if [ ! -f $@ ] ; \ + then echo "Error: could not get component DSDOC file $@" ; \ + exit 1 ; \ + fi +### DOCS END ############################# |