--- src/Makevars.in	2024-06-07 20:08:07.000000000 +0800
+++ src/Makevars.in	2024-06-07 22:04:59.000000000 +0800
@@ -1,11 +1,11 @@
 ## We need C++17 to use TileDB's C++ API
 CXX_STD = CXX17
 
-## We need the TileDB Headers; for macOS aka Darwin need to set minimum version 10.14 for macOS
-PKG_CPPFLAGS = -I. -I../inst/include/ @CXX17_MACOS@ @TILEDB_INCLUDE@ @TILEDB_SILENT_BUILD@ @FILESYSTEM_HEADER_MISSSING@
+## We need the TileDB Headers
+PKG_CPPFLAGS = -I. -I../inst/include/ @TILEDB_INCLUDE@ @TILEDB_SILENT_BUILD@
 
 ## We also need the TileDB library
-PKG_LIBS = @CXX17_MACOS@ @TILEDB_LIBS@ @TILEDB_RPATH@
+PKG_LIBS = @TILEDB_LIBS@ @TILEDB_RPATH@
 
 LIB_CON_DIR = ../inst/lib$(R_ARCH)
 LIB_CON = $(LIB_CON_DIR)/libconnection.so
@@ -16,9 +16,7 @@
         #  - the library is present (implying non-system library use)
         # then let us call install_name_tool
 	@if [ `uname -s` = 'Darwin' ]; then \
-	    install_name_tool -change libz.1.dylib @rpath/libz.1.dylib ../inst/tiledb/lib/libtiledb.dylib; \
-	    install_name_tool -add_rpath @loader_path/../tiledb/lib tiledb.so; \
-	    install_name_tool -add_rpath @loader_path/../tiledb/lib $(LIB_CON); \
+	    install_name_tool -change @rpath/libtiledb.dylib @PREFIX@/lib/libtiledb.dylib tiledb.so; \
 	fi
 
 $(LIB_CON): connection/connection.o