--- python/configure.py.in.orig	2009-04-29 08:01:37.000000000 +0200
+++ python/configure.py.in	2009-04-29 08:36:31.000000000 +0200
@@ -6,6 +6,7 @@
 
 src_path = '@CMAKE_SOURCE_DIR@'
 build_path = '@CMAKE_BINARY_DIR@'
+install_path = '@CMAKE_INSTALL_PREFIX@'
 python_path = src_path + '/python'
 gdal_inc_dir = '@GDAL_INCLUDE_DIR@'
 geos_inc_dir = '@GEOS_INCLUDE_DIR@'
@@ -18,8 +19,12 @@
 if sys.platform == 'darwin':
   qt_libs.append("QtSql")
   # possibility of universal build of bindings
-  osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
-  if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc':
+  osx_arch = '@CMAKE_OSX_ARCHITECTURES@'
+  # Counts the number of archs given
+  if osx_arch [-1] == ';' :
+  	osx_arch = osx_arch [:-1]
+  osx_archs = osx_arch. split (";")
+  if len (osx_archs) > 1 :
     osx_universal = '@CMAKE_OSX_SYSROOT@'
   else:
     osx_universal = ''
@@ -126,7 +131,8 @@
 
 # common settings for both core and gui libs
 for mk in [ makefile_core, makefile_gui ]:
-  mk.extra_libs = ["qgis_core"]
+  mk.extra_lflags.append ("-dylib_file %s/python/core/libqgis_core.dylib:%s/lib/libqgis_core.dylib" % (build_path, install_path))
+  mk.extra_libs = []
   if geos_library!="":
     mk.extra_libs.append(geos_library)
   if gdal_library!="":
@@ -147,7 +154,7 @@
   mk.extra_cxxflags = ["-DCORE_EXPORT="+export]
 
 # more settings for gui lib
-makefile_gui.extra_libs.append("qgis_gui")
+makefile_gui.extra_lflags.append("-dylib_file %s/python/core/libqgis_gui.dylib:%s/lib/libqgis_gui.dylib" % (build_path, install_path))
 makefile_gui.extra_lib_dirs.append(build_path+"/src/gui"+intdir)
 makefile_gui.extra_include_dirs.append(src_path+"/src/gui")
 makefile_gui.extra_include_dirs.append(build_path+"/src/gui")