diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-09-15 19:33:43 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-09-15 19:33:43 +0000 |
| commit | 555680e4d53dc1b2498a9e7dc231d4f517e35ff5 (patch) | |
| tree | acab627be8e7e9ad414c7f1966909a230af93844 /components.mk | |
| parent | 4350f8f529fe4b4d89eccf61a106bb22cc4a90c3 (diff) | |
| download | ds-555680e4d53dc1b2498a9e7dc231d4f517e35ff5.tar.gz ds-555680e4d53dc1b2498a9e7dc231d4f517e35ff5.tar.xz ds-555680e4d53dc1b2498a9e7dc231d4f517e35ff5.zip | |
Bug: 206527
Description: Enable rpmbuild of directory server
Fix Description: RELDIR is not defined in lib/ldaputil/Makefile, so just
remove the certmap.conf packaging from there and add it to ldap/cm/Makefile
The perldap packaging has changed for internal builds as well.
Tested on: Solaris
Diffstat (limited to 'components.mk')
| -rw-r--r-- | components.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components.mk b/components.mk index 71b48533..debb9f0d 100644 --- a/components.mk +++ b/components.mk @@ -623,15 +623,15 @@ DSDOC_COPYRIGHT = slapd_copyright.zip 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 + 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 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 # 32-bit perldap is packaged in 64-bit DS on Solaris and HP-UX PA-RISC. # It requires 32-bit LDAPSDK, NSPR, NSS. |