diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index fc0b46d842ae6f6016203a02330a1e32ff446126..ce76785024edafed74d82beff63fb056d7fcb6af 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -94,6 +94,7 @@ function(dd4hep_generate_rootmap_notapple library)
                      COMMAND ${CMAKE_COMMAND} -Dlibname=$<TARGET_FILE_NAME:${library}> -Drootmapfile=${rootmapfile}
                              -DDD4HEP_LISTCOMPONENTS_CMD=$<TARGET_FILE:DD4hep::listcomponents>
                              -DLIBRARY_LOCATION=$<TARGET_FILE_DIR:${library}>
+                             -DDD4HEP_LIBRARY_LOCATION=$<TARGET_FILE_DIR:DD4hep::DDCore>
                              -DDD4hep_DIR=${DD4hep_DIR}
                              -P ${DD4hep_DIR}/cmake/MakeGaudiMap.cmake)
   add_custom_target(Components_${library} ALL DEPENDS ${rootmapfile})
diff --git a/cmake/MakeGaudiMap.cmake b/cmake/MakeGaudiMap.cmake
index e683e943b036aee9fc969a5a3558c531427f5f2f..3288dcba91ebc14188e6069d1101f3d2de83d21b 100644
--- a/cmake/MakeGaudiMap.cmake
+++ b/cmake/MakeGaudiMap.cmake
@@ -7,10 +7,10 @@ message(STATUS " *** Gaudi listcomponents: Generate map for ${libname} ..." )
     ) 
   GET_FILENAME_COMPONENT(GAUDI_LISTCOMP_INSTALL ${DD4HEP_LISTCOMPONENTS_CMD} DIRECTORY)
   if(APPLE)
-    SET ( ENV{DYLD_LIBRARY_PATH} ${LIBRARY_LOCATION}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
+    SET ( ENV{DYLD_LIBRARY_PATH} ${LIBRARY_LOCATION}:${DD4HEP_LIBRARY_LOCATION}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
     ##EXECUTE_PROCESS( COMMAND echo DYLD_LIBRARY_PATH = $ENV{DYLD_LIBRARY_PATH} )
   else()
-    SET ( ENV{LD_LIBRARY_PATH} ${LIBRARY_LOCATION}:${GAUDI_LISTCOMP_INSTALL}:$ENV{LD_LIBRARY_PATH} )
+    SET ( ENV{LD_LIBRARY_PATH} ${LIBRARY_LOCATION}:${DD4HEP_LIBRARY_LOCATION}:$ENV{LD_LIBRARY_PATH} )
   endif()
   # EXECUTE_PROCESS( COMMAND echo LD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH} )
   EXECUTE_PROCESS( COMMAND