[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.4, 1.30.2.5
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Wed Sep 14 21:34:43 UTC 2005
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28895
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
Fix the patch build on Solaris/HP: Removed an obsolete copy line
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.5
diff -u -r1.30.2.4 -r1.30.2.5
--- Makefile 14 Sep 2005 18:25:51 -0000 1.30.2.4
+++ Makefile 14 Sep 2005 21:34:39 -0000 1.30.2.5
@@ -821,8 +821,7 @@
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 @@
_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 @@
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 $< $@
More information about the Fedora-directory-commits
mailing list