From bcaf265a82c281bcb0c3921d67944a3b42359c84 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 15 Sep 2006 14:59:48 +0000 Subject: Bug: 206527 Description: Enable rpmbuild of directory server Fix Description: You can set env. vars. to override all of the LIB and INCLUDE paths with the make -e flag. I moved all of the external component packaging stuff into the packageDirectory target of ldap/cm/Makefile, and moved the "packaging" of the internal files into the releaseDirectory target. So the releaseDirectory target will now copy all of the ldapserver binaries and runtime files into their correct places under RELDIR, which is then used to create the rpm. There were a couple of other places that needed to change the way a particular file was packaged in order ot make sure it was packaged in the core ds and not as an external component. Tested on: RHEL4 Reviewed by: nhosoi (Thanks!) --- lib/ldaputil/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lib/ldaputil') diff --git a/lib/ldaputil/Makefile b/lib/ldaputil/Makefile index 0102d029..21b39972 100644 --- a/lib/ldaputil/Makefile +++ b/lib/ldaputil/Makefile @@ -60,7 +60,9 @@ MCC_INCLUDE=-I$(BUILD_ROOT)/include \ $(DBM_INCLUDE) $(LDAPSDK_INCLUDE) \ $(SECURITY_INCLUDE) $(NSPR_INCLUDE) -all: $(OBJDEST) $(LOCAL_DEPS) $(LIBS) +CERTMAP_CONF = $(RELDIR)/shared/config/certmap.conf + +all: $(OBJDEST) $(LOCAL_DEPS) $(LIBS) $(CERTMAP_CONF) $(OBJDEST): mkdir -p $(OBJDEST) @@ -92,5 +94,12 @@ $(LIBS): $(OBJS) $(AR) $(OBJS) $(RANLIB) $@ +$(CERTMAP_CONF): certmap.conf + rm -f $@ + if [ ! -d $(dir $@) ] ; then \ + mkdir -p $(dir $@) ; \ + fi + cp $< $(dir $@) + include $(INCLUDE_DEPENDS) -- cgit