Back to branch, try install_name_tool variant

configure

@@ -83,8 +83,8 @@ download() {
 ## respects enviroment variable so 'blpHeaders="/opt/blp/blpHeaders_1.2.3.tar.gz" ./configure' works
 : ${blpHeaders="blpHeaders.tar.gz"}
 : ${blpLibrary="blpLibrary.tar.gz"}
-: ${blpBranch="master"}
-#: ${blpBranch="feature/release_3.24.6.1"}
+#: ${blpBranch="master"}
+: ${blpBranch="feature/release_3.24.6.1"}
 
 ## Check for header files and download if needed, this looks at repo blp in directory headers/
 cwd=$(pwd)
@@ -104,9 +104,8 @@ cd ${cwd}
 mkdir -p inst/blp
 cd blp/${platform}
 if [ ! -f ${blpLibrary} ]; then
-    echo "** Fetching https://github.com/Rblp/blp/raw/${blpBranch}/${platform}${flavour}/blpLibrary.tar.gz"
-    download https://github.com/Rblp/blp/raw/${blpBranch}/${platform}${flavour}/blpLibrary.tar.gz
-    #download https://github.com/Rblp/blp/raw/${blpBranch}/${platform}${flavour}${cpu}/blpLibrary.tar.gz
+    echo "** Fetching https://github.com/Rblp/blp/raw/${blpBranch}/${platform}${flavour}${cpu}/blpLibrary.tar.gz"
+    download https://github.com/Rblp/blp/raw/${blpBranch}/${platform}${flavour}${cpu}/blpLibrary.tar.gz
 else
     echo "** using ${blpLibrary}"
 fi

src/Makevars.in

@@ -30,4 +30,8 @@ PKG_CPPFLAGS = -I../inst/include/ -I.
 PKG_LIBS     = -l$(BBG_LIB) -L../inst/blp -Wl,-rpath,$(BBG_RPATH)
 
 all: $(SHLIB)
-	@if command -v install_name_tool; then echo "fixing"; install_name_tool -add_rpath @loader_path/../blp Rblpapi.so; fi
+	if command -v install_name_tool; then \
+	    echo "fixing"; \
+	    install_name_tool -add_rpath @loader_path/../blp Rblpapi.so; \
+	    install_name_tool -add_rpath @loader_path/../inst/blp Rblpapi.so; \
+	fi