Modify rname etc in Makefiles.

Author: davexparker

prism/ext/ppl/Makefile

@@ -7,7 +7,7 @@
 
 default: all
 
-all: checks libfiles
+all: checks libfiles rpath
 
 # Files to copy
 NATIVE_LIBS =
@@ -52,6 +52,21 @@ libfiles: $(NATIVE_LIBS_COPY) $(COMMON_LIBS_COPY)
 	  fi \
 	fi
 
+rpath:
+	@if [ $(OSTYPE) = "darwin" ]; then \
+	  install_name_tool -id "@rpath/libppl.15.dylib" ../../$(PRISM_LIB_DIR)/libppl.15.dylib; \
+	  install_name_tool -id "@rpath/libppl_java.dylib" ../../$(PRISM_LIB_DIR)/libppl_java.dylib; \
+	  install_name_tool -add_rpath "@loader_path/." ../../$(PRISM_LIB_DIR)/libppl_java.dylib; \
+	  install_name_tool -change "/Users/dxp/tools/tmp/lib/libppl.15.dylib" "@rpath/libppl.15.dylib" ../../$(PRISM_LIB_DIR)/libppl_java.dylib; \
+	  codesign --force --deep --sign - ../../$(PRISM_LIB_DIR)/libppl*.dylib; \
+	fi; \
+	if [ $(OSTYPE) = "linux" ]; then \
+	  patchelf --set-soname "libppl.so.15" ../../$(PRISM_LIB_DIR)/libppl.so.15; \
+	  patchelf --set-soname "libppl_java.so" ../../$(PRISM_LIB_DIR)/libppl_java.so; \
+	  patchelf --set-rpath '$ORIGIN' ../../$(PRISM_LIB_DIR)/libppl_java.so; \
+	  patchelf --replace-needed "libppl.so.15" "libppl.15.so" ../../$(PRISM_LIB_DIR)/libppl_java.so; \
+	fi
+
 clean: checks
 	# Remove installed files if present
 	@if [ "$(COMMON_LIBS_COPY)" != "" ]; then \

prism/ext/yices/Makefile

@@ -7,7 +7,7 @@
 
 default: all
 
-all: checks libfiles
+all: checks libfiles rpath
 
 # Files to copy
 NATIVE_LIBS =
@@ -52,6 +52,20 @@ libfiles: $(NATIVE_LIBS_COPY) $(COMMON_LIBS_COPY)
 	  fi \
 	fi
 
+rpath:
+	@if [ $(OSTYPE) = "darwin" ]; then \
+	  install_name_tool -id "@rpath/libyices.2.dylib" ../../$(PRISM_LIB_DIR)/libyices.2.dylib; \
+	  install_name_tool -id "@rpath/libyices2java.dylib" ../../$(PRISM_LIB_DIR)/libyices2java.dylib; \
+	  install_name_tool -add_rpath "@loader_path/." ../../$(PRISM_LIB_DIR)/libyices2java.dylib; \
+	  install_name_tool -change "/usr/local/lib/libyices.2.dylib" "@rpath/libyices.2.dylib" ../../$(PRISM_LIB_DIR)/libyices2java.dylib; \
+	fi; \
+	if [ $(OSTYPE) = "linux" ]; then \
+	  patchelf --set-soname "libyices.so.2.6"  ../../$(PRISM_LIB_DIR)/libyices.so.2.6; \
+	  patchelf --set-soname "libyices2java.so"  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
+	  patchelf --set-rpath '$ORIGIN'  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
+	  patchelf --replace-needed "libyices.so.2.6" "libyices.so.2.6"  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
+	fi
+
 clean: checks
 	# Remove installed files if present
 	@if [ "$(COMMON_LIBS_COPY)" != "" ]; then \

prism/ext/z3/Makefile

@@ -7,7 +7,7 @@
 
 default: all
 
-all: checks libfiles
+all: checks libfiles rpath
 
 # Files to copy
 NATIVE_LIBS =
@@ -52,6 +52,21 @@ libfiles: $(NATIVE_LIBS_COPY) $(COMMON_LIBS_COPY)
 	  fi \
 	fi
 
+rpath:
+	@if [ $(OSTYPE) = "darwin" ]; then \
+	  install_name_tool -id "@rpath/libz3.dylib" ../../$(PRISM_LIB_DIR)/libz3.dylib; \
+	  install_name_tool -id "@rpath/libz3java.dylib" ../../$(PRISM_LIB_DIR)/libz3java.dylib; \
+	  install_name_tool -add_rpath "@loader_path/." ../../$(PRISM_LIB_DIR)/libz3java.dylib; \
+	  install_name_tool -change "libz3.dylib" "@rpath/libz3.dylib" ../../$(PRISM_LIB_DIR)/libz3java.dylib; \
+	  codesign --force --deep --sign - ../../$(PRISM_LIB_DIR)/libz3*.dylib; \
+	fi; \
+	if [ $(OSTYPE) = "linux" ]; then \
+	  patchelf --set-soname "libz3.so" ../../$(PRISM_LIB_DIR)/libz3.so; \
+	  patchelf --set-soname "libz3java.so" ../../$(PRISM_LIB_DIR)/libz3java.so; \
+	  patchelf --set-rpath '$ORIGIN' ../../$(PRISM_LIB_DIR)/libz3java.so; \
+	  patchelf --replace-needed "libz3.so" "libz3.so" ../../$(PRISM_LIB_DIR)/libz3java.so; \
+	fi
+
 clean: checks
 	# Remove installed files if present
 	@if [ "$(COMMON_LIBS_COPY)" != "" ]; then \