Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2069
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
Fix for the Solaris and HP-UX patch packaging
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.13
retrieving revision 1.30.2.14
diff -u -r1.30.2.13 -r1.30.2.14
--- Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13
+++ Makefile 17 Feb 2006 01:16:22 -0000 1.30.2.14
@@ -713,7 +713,14 @@
fi
ifdef BUILD_PATCH
-# copying a file from the component area
+# take care of files in components (e.g., a file in nsadmin.zip)
+ -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`;
do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e
"s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+ done
+
+# copying files from the component area
-@for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do
\
zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \
sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e
"s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
Show replies by date