13 files changed, 13 insertions, 12 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index f8ee74e5641..d2f0e3db7d6 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -203,6 +203,7 @@ EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexp
 EXPAT_RPATH_LINK        = $(if $(EXPAT_HOME),$(call rpathlink,$(EXPAT_HOME)/$(libsubdir)))
 
 MCPP_LIBS              = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(libsubdir)) -lmcpp
+MCPP_RPATH_LINK        = $(if $(MCPP_HOME),$(call rpathlink,$(MCPP_HOME)/$(libsubdir)))
 
 ifeq ($(PLATFORM_HAS_READLINE),yes)
     ifeq ($(USE_READLINE),yes)
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 707a3cd712a..57702f45e2d 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2cppe/Makefile b/cpp/src/slice2cppe/Makefile
index fc4fd1b54c1..56d6adc242f 100644
--- a/cpp/src/slice2cppe/Makefile
+++ b/cpp/src/slice2cppe/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(INSTALL_PROGRAM) $(NAME) $(install_bindir)
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index 7d622daa185..f15f425744d 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile
index 74c1d2fe885..897c4b058a2 100644
--- a/cpp/src/slice2docbook/Makefile
+++ b/cpp/src/slice2docbook/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index 19983e410c9..670e9cc8a74 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index ed179f476aa..82fc0db7c3c 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile
index caba32d86a7..5299baccf0f 100644
--- a/cpp/src/slice2html/Makefile
+++ b/cpp/src/slice2html/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 67a77f22431..61584c74c33 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2javae/Makefile b/cpp/src/slice2javae/Makefile
index f9992992d78..23f8cfe4e5c 100644
--- a/cpp/src/slice2javae/Makefile
+++ b/cpp/src/slice2javae/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(INSTALL_PROGRAM) $(NAME) $(install_bindir)
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index bd4f2de9d6e..ca8678b966f 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index 6ce39c89b4d..7c3f5c44670 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))
diff --git a/cpp/src/slice2sl/Makefile b/cpp/src/slice2sl/Makefile
index 3e2c3f48179..5280f2a2c14 100644
--- a/cpp/src/slice2sl/Makefile
+++ b/cpp/src/slice2sl/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK)
 
 install:: all
 	$(call installprogram,$(NAME),$(install_bindir))