HPCC-16990 Use MACOSX_RPATH instead of INSTALL_NAME_DIR

Signed-off-by: Michael Gardner <michael.gardner@lexisnexis.com>

cmake_modules/commonSetup.cmake

@@ -116,6 +116,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         set( MAKE_CONFIGURATOR ON )
   endif()
 
+
     MACRO(SET_PLUGIN_PACKAGE plugin)
         string(TOLOWER "${plugin}" pname)
 	    if(DEFINED pluginname)
@@ -232,7 +233,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   endif()
 
   if ( CLIENTTOOLS_ONLY )
-      set(PYEMBED ON)
+      set(PY2EMBED ON)
       set(PLATFORM OFF)
       set(DEVEL OFF)
   endif()
@@ -903,14 +904,13 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   else ( )
     set ( CMAKE_INSTALL_PREFIX "${INSTALL_DIR}/${version}/clienttools" )
   endif ( PLATFORM OR PLUGIN )
+  if(APPLE)
+    set(CMAKE_MACOSX_RPATH ON)
+  endif()
   set (CMAKE_SKIP_BUILD_RPATH  FALSE)
   set (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
   set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR};${CMAKE_INSTALL_PREFIX}/${PLUGINS_DIR}")
   set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-  if (APPLE)
-    # used to locate libraries when compiling ECL
-    set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
-  endif()
   MACRO (FETCH_GIT_TAG workdir edition result)
       execute_process(COMMAND "${GIT_COMMAND}" describe --tags --dirty --abbrev=6 --match ${edition}*
         WORKING_DIRECTORY "${workdir}"