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 /components.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 'components.mk')
| -rw-r--r-- | components.mk | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/components.mk b/components.mk index 5fca8f72..2ec85975 100644 --- a/components.mk +++ b/components.mk @@ -576,6 +576,29 @@ endif LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar +#### online help docs ###### +ifndef ONLINEHELP_SOURCE_ROOT + DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc +else + DSDOC_DIR = $(ONLINEHELP_SOURCE_ROOT) +endif +DSDOC_CLIENTS = slapd_clients.zip +DSDOC_COPYRIGHT = slapd_copyright.zip + +########### PerLDAP ############# +ifdef PERLDAP_SOURCE_ROOT + PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib +# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk +endif + +PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch +PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla +PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto +# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/ +PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl +PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl +PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl + # must define dependencies last because they depend on the definitions above ifeq ($(INTERNAL_BUILD), 1) include $(BUILD_ROOT)/internal_comp_deps.mk @@ -747,17 +770,3 @@ endif else -@echo "MAVEN is not required except on Windows." endif #WINNT - -########### PerLDAP ############# -ifdef PERLDAP_SOURCE_ROOT - PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib -# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk -endif - -PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch -PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla -PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto -# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/ -PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl -PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl -PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl |