diff options
| -rw-r--r-- | components.mk | 14 | ||||
| -rw-r--r-- | internal_comp_deps.mk | 5 | ||||
| -rw-r--r-- | ldap/cm/Makefile | 2 | ||||
| -rw-r--r-- | lib/ldaputil/Makefile | 11 |
4 files changed, 13 insertions, 19 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. diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 5bdf4aab..011d1d9a 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -538,8 +538,9 @@ endif ### Perldap package ####################################### PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME) -PERLDAP_FILES=lib,arch -PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib +PERLDAP_FILES=lib +PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib/perl +PACKAGE_SRC_DEST += $(PERLDAP_DEP) lib # this is the rule to pull PerLDAP ifndef PERLDAP_PULL_METHOD diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 07348f54..df8c2861 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -310,6 +310,8 @@ releaseDirectory: $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/*.ldif $(RELDIR)/bin/slapd/install/schema $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/slapd-collations.conf $(RELDIR)/bin/slapd/install/config + $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/lib/ldaputil/certmap.conf $(RELDIR)/shared/config + # the httpd library ifneq ($(ARCH), WINNT) $(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(RELDIR)/bin/slapd/lib diff --git a/lib/ldaputil/Makefile b/lib/ldaputil/Makefile index 21b39972..0102d029 100644 --- a/lib/ldaputil/Makefile +++ b/lib/ldaputil/Makefile @@ -60,9 +60,7 @@ MCC_INCLUDE=-I$(BUILD_ROOT)/include \ $(DBM_INCLUDE) $(LDAPSDK_INCLUDE) \ $(SECURITY_INCLUDE) $(NSPR_INCLUDE) -CERTMAP_CONF = $(RELDIR)/shared/config/certmap.conf - -all: $(OBJDEST) $(LOCAL_DEPS) $(LIBS) $(CERTMAP_CONF) +all: $(OBJDEST) $(LOCAL_DEPS) $(LIBS) $(OBJDEST): mkdir -p $(OBJDEST) @@ -94,12 +92,5 @@ $(LIBS): $(OBJS) $(AR) $(OBJS) $(RANLIB) $@ -$(CERTMAP_CONF): certmap.conf - rm -f $@ - if [ ! -d $(dir $@) ] ; then \ - mkdir -p $(dir $@) ; \ - fi - cp $< $(dir $@) - include $(INCLUDE_DEPENDS) |