diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-04-17 23:12:55 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-04-17 23:12:55 +0000 |
| commit | b05fcc79a9eb7838de2632df3bb49a921570ef3d (patch) | |
| tree | 0c905691bbca3f360d637d4669e01b564191d480 | |
| parent | 44c865863e12df57be8d6034a3a3d6f4bf0f499b (diff) | |
Should keep all the components packaged in the 64-bit build in dist/<platform>_64_DBG.OBJ
| -rw-r--r-- | internal_buildpaths.mk | 6 | ||||
| -rw-r--r-- | internal_comp_deps.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/internal_buildpaths.mk b/internal_buildpaths.mk index 00556d43..30c292ec 100644 --- a/internal_buildpaths.mk +++ b/internal_buildpaths.mk @@ -77,7 +77,7 @@ endif #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 @@ endif # DBM_SOURCE_ROOT #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 @@ endif # SVRCORE_SOURCE_ROOT #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 diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 5468ace1..c0ed246e 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -91,6 +91,7 @@ endif $(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 @@ ifeq ($(PACKAGE_LIB32), 1) $(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 @@ ifeq ($(PACKAGE_LIB32), 1) $(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 |