Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4910
Modified Files:
internal_buildpaths.mk internal_comp_deps.mk
Log Message:
Should keep all the components packaged in the 64-bit build in
dist/<platform>_64_DBG.OBJ
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- internal_buildpaths.mk 13 Apr 2006 05:26:51 -0000 1.10
+++ internal_buildpaths.mk 17 Apr 2006 23:12:55 -0000 1.11
@@ -77,7 +77,7 @@
#NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
ifndef NSPR_SOURCE_ROOT
NSPR_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nspr
-NSPR_BUILD_DIR_32 = $(NSCP_DISTDIR_FULL_RTL_32)/nspr
+NSPR_BUILD_DIR_32 = $(NSCP_DISTDIR_FULL_RTL)/nspr32
# NSPR also needs a build dir with a full, absolute path for some reason
NSPR_ABS_BUILD_DIR = $(NSCP_ABS_DISTDIR_FULL_RTL)/nspr
endif # NSPR_SOURCE_ROOT
@@ -90,7 +90,7 @@
#SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
ifndef SECURITY_SOURCE_ROOT
SECURITY_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nss
-SECURITY_BUILD_DIR_32 = $(NSCP_DISTDIR_FULL_RTL_32)/nss
+SECURITY_BUILD_DIR_32 = $(NSCP_DISTDIR_FULL_RTL)/nss32
endif # SECURITY_SOURCE_ROOT
#SVRCORE_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
@@ -101,7 +101,7 @@
#LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
ifndef LDAPSDK_SOURCE_ROOT
LDAP_ROOT = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk
-LDAP_ROOT_32 = $(NSCP_DISTDIR_FULL_RTL_32)/ldapsdk
+LDAP_ROOT_32 = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk32
endif # LDAPSDK_SOURCE_ROOT
#SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- internal_comp_deps.mk 13 Apr 2006 23:12:13 -0000 1.41
+++ internal_comp_deps.mk 17 Apr 2006 23:12:55 -0000 1.42
@@ -91,6 +91,7 @@
$(SECURITY_DEP): $(NSCP_DISTDIR_FULL_RTL)
ifdef COMPONENT_DEPS
+ $(RM) -rf $(SECURITY_BINPATH)
mkdir -p $(SECURITY_BINPATH)
$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-objdir $(SECURITY_BUILD_DIR) -componentdir $(SECURITY_IMPORT) \
@@ -186,6 +187,7 @@
$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-objdir $(NSPR_BUILD_DIR_32) -componentdir $(NSPR_IMPORT_32) \
-files lib
+ $(RM) -rf $(SECURITY_BUILD_DIR_32)/lib
mkdir -p $(SECURITY_BUILD_DIR_32)/lib
$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-objdir $(SECURITY_BUILD_DIR_32)/lib -componentdir $(SECURITY_IMPORT_32)/lib \
@@ -193,7 +195,9 @@
$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
-objdir $(LDAP_ROOT_32) -componentdir $(LDAP_RELEASE_32) \
-files lib
- mv -f $(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI_FILE)
$(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI32_FILE)
+ -@if [ -f $(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI_FILE) ] ; then \
+ mv -f $(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI_FILE)
$(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI32_FILE) ; \
+ fi
endif # PACKAGE_LIB32
##
endif # LDAPSDK_SOURCE_ROOT
Show replies by thread