[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.11, 1.30.2.12

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13461

Modified Files:
      Tag: Directory71RtmBranch
	Makefile 
Log Message:
[171306] Cleanup of admin server code
Fixed the broken build (64-bit Solaris and HP-UX). 
Macro (NC_BUILD_FLAVOR) does not include '_64' tag.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.11
retrieving revision 1.30.2.12
diff -u -r1.30.2.11 -r1.30.2.12
--- Makefile	22 Oct 2005 00:07:42 -0000	1.30.2.11
+++ Makefile	22 Oct 2005 07:00:03 -0000	1.30.2.12
@@ -658,7 +658,7 @@
 ifdef BUILD_PATCH
 # take care of files in components (e.g., a file in nsadmin.zip)
 	- at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
-	  zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NC_BUILD_FLAVOR)/"` ; \
+	  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
@@ -931,7 +931,7 @@
 
 cleanDirectory:
 	cd $(LDAPDIR); $(MAKE) clean
-	rm -rf $(BUILD_ROOT)/../dist/$(NC_BUILD_FLAVOR)
+	rm -rf $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
 	rm -rf $(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)