From 2daee1be7ebbe22b0e57eb5378b6b48aedb2a610 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed, 14 Sep 2005 18:25:51 +0000
Subject: 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.

---
 ldap/cm/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 1fa4f8e7..9a8bf52c 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -1009,6 +1009,9 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.z:
 
 _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)/dsinst.dll: $(OBJDIR)/setup/dsinst.dll
 $(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 $< $@
 
-- 
cgit