[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.6, 1.30.2.7

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
      Tag: Directory71RtmBranch
	Makefile 
Log Message:
[160003] db2index.pl cannot find libldap50.so if only certain parameters are used
1) Makefile: SP packages ns-config and needed libraries
2) slapd-patch.inf: call "ns-config -r" in the pre install phase; "ns-update"
in the post install phase. 



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.6
retrieving revision 1.30.2.7
diff -u -r1.30.2.6 -r1.30.2.7
--- Makefile	16 Sep 2005 00:31:45 -0000	1.30.2.6
+++ Makefile	16 Sep 2005 20:01:17 -0000	1.30.2.7
@@ -820,6 +820,13 @@
 	echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
 # create a zip file based upon the $(PATCHINF) file
 	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
+# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
+	$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
+	- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
+	do if [ -f $$file ] ; \
+	then $(INSTALL) -m 755 $$file $(PATCHINSTDIR)/$(SLAPDSP) ; \
+	fi ; \
+	done
 # create patch inf file: $(SLAPD).inf
 	cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
 	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp