[EmbedFrameworksScript] Update for CONFIGURATION_BUILD_DIR compatibility

c382a0f3 · Samuel E. Giddins · 8ad48537 · c382a0f3 · 6b51ac1f
Commit c382a0f3 authored Jun 25, 2015 by Samuel E. Giddins
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

embed_frameworks_script.rb lib/cocoapods/generator/embed_frameworks_script.rb +3 -3

cocoapods-integration-specs spec/cocoapods-integration-specs +1 -1

No files found.
--- a/lib/cocoapods/generator/embed_frameworks_script.rb
+++ b/lib/cocoapods/generator/embed_frameworks_script.rb
@@ -45,10 +45,10 @@ module Pod

          install_framework()
          {
-            if [ -r "${BUILT_PRODUCTS_DIR}/#{target_definition.label}/$1" ]; then
-              local source="${BUILT_PRODUCTS_DIR}/#{target_definition.label}/$1"
-            else
+            if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
              local source="${BUILT_PRODUCTS_DIR}/$1"
+            else
+              local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
            fi

            local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

--- a/cocoapods-integration-specs @ 6b51ac1f
+++ b/cocoapods-integration-specs @ 6b51ac1f
-Subproject commit 9793ea0fa86ceb9656ed768e58fa3d6db1407dd7
+Subproject commit 6b51ac1f956462570b9fb75516bd96f83017a72b