diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2005-09-14 21:34:39 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2005-09-14 21:34:39 +0000 |
| commit | 8177361a961e00709895762dbb9bf142dd1391e9 (patch) | |
| tree | 142580c32e865cd9cd848a099ef2af2cce696694 | |
| parent | 2daee1be7ebbe22b0e57eb5378b6b48aedb2a610 (diff) | |
| download | ds-8177361a961e00709895762dbb9bf142dd1391e9.tar.gz ds-8177361a961e00709895762dbb9bf142dd1391e9.tar.xz ds-8177361a961e00709895762dbb9bf142dd1391e9.zip | |
Fix the patch build on Solaris/HP: Removed an obsolete copy line
| -rw-r--r-- | ldap/cm/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 9a8bf52c..9ea9873a 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -821,8 +821,7 @@ ifndef BUILD_RPM 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}'` -# create patch inf file: $(SLAPD).inf - cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf +# create patch inf file: $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPD).inf cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2 echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf @@ -1010,8 +1009,10 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.z: _setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \ ifdef BUILD_PATCH +ifndef BUILD_RPM $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \ endif +endif $(INSTDIR)/admin $(INSTDIR)/base \ $(INSTDIR)/svrcore $(INSTDIR)/tools # see components.mk for a description of PACKAGE_SETUP_LIBS @@ -1028,9 +1029,11 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf cp $< $@ ifdef BUILD_PATCH +ifndef BUILD_RPM $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf cp $< $@ endif +endif $(INSTDIR)/admin: $(ADMSERV_DIR)/admin cp -R $< $@ |