[Fedora-directory-commits] ldapserver components.mk, 1.53, 1.54 internal_comp_deps.mk, 1.46, 1.47

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21119/ldapserver

Modified Files:
	components.mk internal_comp_deps.mk 
Log Message:
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



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- components.mk	15 Sep 2006 14:59:47 -0000	1.53
+++ components.mk	15 Sep 2006 19:33:42 -0000	1.54
@@ -623,15 +623,15 @@
 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.


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- internal_comp_deps.mk	7 Sep 2006 15:29:58 -0000	1.46
+++ internal_comp_deps.mk	15 Sep 2006 19:33:42 -0000	1.47
@@ -538,8 +538,9 @@
 ### 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