From c942e576c12833664fe93ed4005fa01d5640f6a9 Mon Sep 17 00:00:00 2001
From: Marco Antognini <antognini.marco@gmail.com>
Date: Thu, 8 Sep 2011 12:03:09 +0200
Subject: [PATCH] fixed creation of frameworks and a minor error in xcode 4
 template script

---
 cmake/Macros.cmake                                     | 10 +++++-----
 .../TemplateInfo.plist                                 |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index 0488f524..83be942e 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -148,12 +148,12 @@ macro(sfml_add_library target)
                                   MACOSX_FRAMEWORK_IDENTIFIER org.sfml-dev.${target}
                                   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
                                   MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-        else()
-            # adapt install directory to allow distributing dylibs in user’s frameworks
-            set_target_properties(${target} PROPERTIES 
-                                  BUILD_WITH_INSTALL_RPATH 1 
-                                  INSTALL_NAME_DIR "@executable_path/../Frameworks")
         endif()
+        
+        # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks
+        set_target_properties(${target} PROPERTIES 
+                              BUILD_WITH_INSTALL_RPATH 1 
+                              INSTALL_NAME_DIR "@executable_path/../Frameworks")
     endif()
 
     # link the target to its external dependencies
diff --git a/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist b/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist
index a9bb42bc..d197a548 100644
--- a/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist	
+++ b/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist	
@@ -679,7 +679,7 @@ require () # $1 is a SFML module like 'system' or 'audio'
         # clean potentially old stuff
         rm -f $dest/libsfml-$1.2.dylib
         rm -f $dest/libsfml-$1-d.2.dylib
-        rm -f $dest/sfml-$1.framework
+        rm -fr $dest/sfml-$1.framework
     
         # copy SFML libraries
         if [ $frameworks ]