Correctly configure POD_SRCROOT for Pods and target project.

lib/cocoapods/installer.rb

@@ -29,7 +29,8 @@ module Pod
       def xcconfig
         @xcconfig ||= Xcodeproj::Config.new({
           # In a workspace this is where the static library headers should be found.
-          'HEADER_SEARCH_PATHS' => '"Pods/Headers"',
+          'POD_SRCROOT' => '$(SRCROOT)/Pods',
+          'HEADER_SEARCH_PATHS' => '"$(POD_SRCROOT)/Headers"',
           'ALWAYS_SEARCH_USER_PATHS' => 'YES',
           # This makes categories from static libraries work, which many libraries
           # require, so we add these by default.
@@ -131,6 +132,7 @@ module Pod
           config.baseConfiguration = xcconfig_file
           config.buildSettings['OTHER_LDFLAGS'] = ''
           config.buildSettings['GCC_PREFIX_HEADER'] = prefix_header_filename
+          config.buildSettings['POD_SRCROOT'] = '$(SRCROOT)'
         end
       end
 

lib/cocoapods/xcodeproj_ext.rb

@@ -99,7 +99,6 @@ module Xcodeproj
     def self.build_settings(platform, scheme)
       settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform])
       settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES'
-      settings['POD_SRCROOT'] = '$(SRCROOT)'
       if scheme == :debug
         settings.merge!(COMMON_BUILD_SETTINGS[:debug])
         settings['ONLY_ACTIVE_ARCH'] = 'YES' if platform == :osx