Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22719
Modified Files: Tag: Directory71RtmBranch Makefile Log Message: Fixed the 64-bit patch build; when building the installer USE_64 flag is cleared. The patch info file had to be explicitly copied as the slapd info file being done.
Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.3 retrieving revision 1.30.2.4 diff -u -r1.30.2.3 -r1.30.2.4 --- Makefile 13 Sep 2005 17:22:04 -0000 1.30.2.3 +++ Makefile 14 Sep 2005 18:25:51 -0000 1.30.2.4 @@ -1009,6 +1009,9 @@
_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \ +ifdef BUILD_PATCH + $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \ +endif $(INSTDIR)/admin $(INSTDIR)/base \ $(INSTDIR)/svrcore $(INSTDIR)/tools # see components.mk for a description of PACKAGE_SETUP_LIBS @@ -1024,6 +1027,11 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf cp $< $@
+ifdef BUILD_PATCH +$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf + cp $< $@ +endif + $(INSTDIR)/admin: $(ADMSERV_DIR)/admin cp -R $< $@
389-commits@lists.fedoraproject.org