diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2005-10-22 07:00:03 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2005-10-22 07:00:03 +0000 |
| commit | d61a8fa68bdf47514f54010f0537958a92ab1860 (patch) | |
| tree | 1a1660a3f25d1de1e3f9f0bce10809adfb8aa92b | |
| parent | 73e6bcadfc8ff3a195b0a7e81269d100799d7ea1 (diff) | |
| download | ds-d61a8fa68bdf47514f54010f0537958a92ab1860.tar.gz ds-d61a8fa68bdf47514f54010f0537958a92ab1860.tar.xz ds-d61a8fa68bdf47514f54010f0537958a92ab1860.zip | |
[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.
| -rw-r--r-- | ldap/cm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 4bcaffe6..71d3ac37 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -658,7 +658,7 @@ endif ifdef BUILD_PATCH # 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)\/$(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 @@ endif # BUILD_SHIP 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) |