Index: ../trunk-jpl/src/wrappers/python/Makefile.am
===================================================================
--- ../trunk-jpl/src/wrappers/python/Makefile.am	(revision 24661)
+++ ../trunk-jpl/src/wrappers/python/Makefile.am	(revision 24662)
@@ -71,12 +71,12 @@
 # - On macOC, static linking of binaries is not supported.
 #
 if STANDALONE_MODULES
-if MAC
-AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
-else
+#if MAC
+#AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
+#else
 AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
 endif
-endif
+#endif
 
 AM_LDFLAGS 	+= --no-warnings
 AM_CXXFLAGS += -D_HAVE_PYTHON_MODULES_ -fPIC
Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
===================================================================
--- ../trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 24661)
+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 24662)
@@ -95,12 +95,12 @@
 # - On macOC, static linking of binaries is not supported.
 #
 if STANDALONE_MODULES
-if MAC
-AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
-else
+#if MAC
+#AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
+#else
 AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
 endif
-endif
+#endif
 
 AM_CXXFLAGS += -D_HAVE_MATLAB_MODULES_ -fPIC