From 5ab9b966c8650d4f169094d9f91b50013db92dc0 Mon Sep 17 00:00:00 2001
From: Alex Lin <alexander.s.lin@nasa.gov>
Date: Wed, 24 Jun 2015 16:15:21 -0500
Subject: [PATCH] Remove duplicate stand-alone libraries

Forgot that the rpath syntax is different on Linux and Macs.

refs #71
---
 share/trick/makefiles/Makefile.common  | 2 +-
 share/trick/makefiles/config_Darwin.mk | 1 +
 share/trick/makefiles/config_Linux.mk  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common
index f5797097..79ae54c4 100644
--- a/share/trick/makefiles/Makefile.common
+++ b/share/trick/makefiles/Makefile.common
@@ -133,7 +133,7 @@ TRICK_DEFINES = $(shell $(PERL) -e '@defines = "${TRICK_CFLAGS}" =~ /-D\s*(\S+)/
 
 IO_SRC_DIR     := io_src/
 OBJ_DIR        := object_${TRICK_HOST_CPU}
-TRICK_LIBS = -Wl,-rpath=${TRICK_LIB_DIR} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units
+TRICK_LIBS = ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units
 TRICK_STATIC_LIB := ${TRICK_LIB_DIR}/libtrick.a
 TRICK_RANLIB =
 
diff --git a/share/trick/makefiles/config_Darwin.mk b/share/trick/makefiles/config_Darwin.mk
index 20bbd969..27a0beb7 100644
--- a/share/trick/makefiles/config_Darwin.mk
+++ b/share/trick/makefiles/config_Darwin.mk
@@ -4,6 +4,7 @@ INSTALL = /usr/bin/install
 SHARED_LIB_OPT := -dynamiclib -Wl,-undefined,dynamic_lookup
 
 TRICK_LIB_DIR  := ${TRICK_HOME}/lib
+RPATH = -Wl,-rpath,${TRICK_LIB_DIR}
 TRICK_LDFLAGS +=
 LD_WHOLE_ARCHIVE := -Wl,-all_load
 LD_NO_WHOLE_ARCHIVE :=
diff --git a/share/trick/makefiles/config_Linux.mk b/share/trick/makefiles/config_Linux.mk
index 20da47d0..a5619e9c 100644
--- a/share/trick/makefiles/config_Linux.mk
+++ b/share/trick/makefiles/config_Linux.mk
@@ -15,6 +15,7 @@ TRICK_LIB_DIR  := ${TRICK_HOME}/lib
 endif
 
 SHARED_LIB_OPT := -shared
+RPATH = -Wl,-rpath=${TRICK_LIB_DIR}
 
 ifeq ($(MAKELEVEL),0)
 export TRICK_LDFLAGS += -Wl,--export-dynamic