diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-10-31 15:55:35 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-10-31 15:55:35 +0000 |
| commit | bfeff9151d64ecae476b3723cdc8205d53909a26 (patch) | |
| tree | 35435af65b58552eed9720ab56118a20276fe451 /internal_comp_deps.mk | |
| parent | 2021746ab9832bbd8a4cbb4d788f1a8556667d81 (diff) | |
| download | ds-bfeff9151d64ecae476b3723cdc8205d53909a26.tar.gz ds-bfeff9151d64ecae476b3723cdc8205d53909a26.tar.xz ds-bfeff9151d64ecae476b3723cdc8205d53909a26.zip | |
Bug(s) fixed: 172056
Bug Description: Fix internal component versions and formats for initial
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g.
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.
Made the ds onlinehelp docs available to build externally. Perldap has
no zip file anymore, just the dirs we copy over. Adminserver includes
the unzipped directories - we need to fix that eventually, but in the
meantime, I made tar skip those unzipped directories. I also merged
Noriko's fix for the assecure.txt problem in setup into Fedora DS. Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Diffstat (limited to 'internal_comp_deps.mk')
| -rw-r--r-- | internal_comp_deps.mk | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 90492f28..b5a2b929 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -327,8 +327,8 @@ ifeq ($(BUILD_MODE), int) ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) # ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) else - ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) -# ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +# ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) + ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) endif ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil @@ -550,8 +550,12 @@ endif ########################################################### #LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV) +ifeq ($(BUILD_MODE), int) LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR) -LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/ldapconsole/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars +else +LDAPCONSOLE_RELEASE=$(FED_COMPONENTS_DIR) +endif +LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)/$(LDAPCONSOLE_RELDATE)/jars LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN) @@ -573,7 +577,11 @@ endif ### Perldap package ####################################### #PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) -PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) +ifeq ($(BUILD_MODE), int) +PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) +else +PERLDAP_COMPONENT_DIR = $(FED_COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) +endif PERLDAP_FILES=lib,arch PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib @@ -584,12 +592,12 @@ endif $(PERLDAP_DEP): ifdef INTERNAL_BUILD - $(RM) $@ + $(RM) -rf $@ $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \ -objdir $(dir $@) \ -componentdir $(PERLDAP_COMPONENT_DIR) \ -files $(PERLDAP_FILES) - @if [ ! -f $@ ] ; \ + @if [ ! -d $@ ] ; \ then echo "Error: could not get component PERLDAP file $@" ; \ exit 1 ; \ fi @@ -603,12 +611,15 @@ ADMIN_REL_DATE = $(ADM_VERSION) #ADMIN_FILE = adminserver.tar.gz ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS)) ADMIN_FILE_TAR = adminserver.tar +ifeq ($(BUILD_MODE), int) IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE) -IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32) +else +IMPORTADMINSRV_BASE=$(FED_COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE) +endif +IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME) ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf ADM_VERSION = $(ADM_RELDATE) -ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME) ifndef ADMSERV_PULL_METHOD ADMSERV_PULL_METHOD = $(COMPONENT_PULL_METHOD) @@ -632,13 +643,14 @@ endif ### DOCS ################################# # this is where the build looks for slapd docs -DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc -DSDOC_VERSDIR = $(DIR_NORM_VERSION)$(BUILD_MODE) -#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE) -DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE) +DSDOC_VERSDIR = $(DIR_NORM_VERSION) +ifeq ($(BUILD_MODE), int) +#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE) +DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE) +else +DSDOC_RELEASE = $(FED_COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE) +endif -DSDOC_CLIENTS = slapd_clients.zip -DSDOC_COPYRIGHT = slapd_copyright.zip DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS) DSDOC_DEP := $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) |