summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-02-17 01:16:22 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-02-17 01:16:22 +0000
commitdc211b085ec4976877d00d9cbc371ef6bd88ef96 (patch)
treece48a28c7c28846d8f1e1a2df37a1c231e3e1ff7
parent465c4bee963b5ae3e5acfb598b43032d1ab0792e (diff)
Fix for the Solaris and HP-UX patch packaging
-rw-r--r--ldap/cm/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index cb3d4bba..e152b158 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -713,7 +713,14 @@ endif
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)/"` ; \