diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2005-09-14 18:25:51 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2005-09-14 18:25:51 +0000 |
| commit | 2daee1be7ebbe22b0e57eb5378b6b48aedb2a610 (patch) | |
| tree | b16b555be3bee2083e5a7debfd9f538e034ca636 | |
| parent | cd94ba3b22d1c0d6bd055bca11d985fd2f43f7d1 (diff) | |
| download | ds-2daee1be7ebbe22b0e57eb5378b6b48aedb2a610.tar.gz ds-2daee1be7ebbe22b0e57eb5378b6b48aedb2a610.tar.xz ds-2daee1be7ebbe22b0e57eb5378b6b48aedb2a610.zip | |
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.
| -rw-r--r-- | ldap/cm/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
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 $< $@ |