=== modified file 'kicad/CMakeLists.txt'
--- kicad/CMakeLists.txt	2016-03-01 00:44:15 +0000
+++ kicad/CMakeLists.txt	2016-05-28 10:19:38 +0000
@@ -101,7 +101,7 @@
             file( GLOB WXPYTHON_DIR RELATIVE ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR} ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR}/wx-?.?-osx_cocoa )
             file( GLOB PYTHON_SCRIPTING_SO ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR}/*.so )
             set( BUNDLE_FIX_LIBS \${BUNDLE_FIX_LIBS} \${PYTHON_SCRIPTING_SO} )
-            file( GLOB PYTHON_SCRIPTING_SO ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR}/\${WXPYTHON_DIR}/wx/*.so )
+            file( GLOB PYTHON_SCRIPTING_SO ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR}/wx/*.so )
             set( BUNDLE_FIX_LIBS \${BUNDLE_FIX_LIBS} \${PYTHON_SCRIPTING_SO} )
         endif()
 

=== modified file 'pcbnew/CMakeLists.txt'
--- pcbnew/CMakeLists.txt	2016-04-17 14:11:14 +0000
+++ pcbnew/CMakeLists.txt	2016-05-28 08:26:17 +0000
@@ -658,17 +658,7 @@
 
 
 if( KICAD_SCRIPTING )
-    if( NOT APPLE )
-        install( FILES ${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py DESTINATION ${PYTHON_DEST} )
-    else()
-        # put into bundle at build time, it is relocated at install
-        add_custom_target( ScriptingPcbnewPyCopy ALL
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py" "${PYTHON_DEST}/"
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py
-            COMMENT "Copying pcbnew.py into ${PYTHON_DEST}"
-            )
-        add_dependencies( ScriptingPcbnewPyCopy ScriptingWxpythonCopy )
-    endif()
+    install( FILES ${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py DESTINATION ${PYTHON_DEST} )
 
     # scripting plugins
     install( DIRECTORY ${PROJECT_SOURCE_DIR}/pcbnew/scripting/plugins/
@@ -692,36 +682,17 @@
 
     if( MINGW )
         install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.pyd DESTINATION ${PYTHON_DEST} )
-    elseif( APPLE )
-         # put everything into bundle at build time, it is relocated at install
-        add_custom_target( ScriptingModulesPcbnewSoCopy ALL
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so" "${PYTHON_DEST}/"
-            DEPENDS _pcbnew
-            COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}"
-            )
-        add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy )
     else()
         install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so DESTINATION ${PYTHON_DEST} )
     endif()
 endif()
 
-if( APPLE )
-    if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
-        # find wx-X.Y-osx_cocoa path below PYTHON_SITE_PACKAGE_PATH
-        file( GLOB WXPYTHON_DIR RELATIVE ${PYTHON_SITE_PACKAGE_PATH} ${PYTHON_SITE_PACKAGE_PATH}/wx-?.?-osx_cocoa )
-        if( NOT WXPYTHON_DIR )
-            message( FATAL_ERROR "Could not find 'wx-?.?-osx_cocoa' in '${PYTHON_SITE_PACKAGE_PATH}'" )
-        endif()
-        # copy contents
-        add_custom_target( ScriptingWxpythonCopy ALL
-            COMMAND ${CMAKE_COMMAND} -E copy_directory "${PYTHON_SITE_PACKAGE_PATH}/${WXPYTHON_DIR}" "${PYTHON_DEST}/${WXPYTHON_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_SITE_PACKAGE_PATH}/wxversion.py" "${PYTHON_DEST}"
-            COMMENT "Copying wxPython into ${PYTHON_DEST}"
-            )
-    endif()
+if( APPLE AND KICAD_SCRIPTING_WXPYTHON )
+    # find wx-X.Y-osx_cocoa path below PYTHON_SITE_PACKAGE_PATH
+    file( GLOB WXPYTHON_DIR RELATIVE ${PYTHON_SITE_PACKAGE_PATH} ${PYTHON_SITE_PACKAGE_PATH}/wx-?.?-osx_cocoa )
+    install( DIRECTORY ${PYTHON_SITE_PACKAGE_PATH}/${WXPYTHON_DIR}/wx DESTINATION ${PYTHON_DEST} )
 endif()
 
-
 if( false )     # haven't been used in years.
     # This one gets made only when testing.
     add_executable( specctra_test EXCLUDE_FROM_ALL specctra_test.cpp specctra.cpp )

=== modified file 'scripting/python_scripting.cpp'
--- scripting/python_scripting.cpp	2015-12-21 14:55:31 +0000
+++ scripting/python_scripting.cpp	2016-05-28 10:25:33 +0000
@@ -147,7 +147,8 @@
 #ifdef KICAD_SCRIPTING_WXPYTHON
     PyEval_InitThreads();
 
-#ifndef __WINDOWS__     // import wxversion.py currently not working under winbuilder, and not useful.
+// wxversion.py is not used under winbuilder nor under OSX
+#if !defined( __WINDOWS__ ) && !defined( __WXMAC__ )
     char cmd[1024];
     // Make sure that that the correct version of wxPython is loaded. In systems where there
     // are different versions of wxPython installed this can lead to select wrong wxPython