More updates for ICE-5931, ICE-5935

17 files changed, 17 insertions, 17 deletions

diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index aa54d63ad78..04d83e89767 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -37,7 +37,7 @@ OBJS		= $(COMMON_OBJS) $(TRANSFORM_OBJS) $(DUMP_OBJS)
 
 HDIR		= $(headerdir)/FreezeScript
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
index bd6df67448d..1f0de439f88 100644
--- a/cpp/src/Glacier2/Makefile
+++ b/cpp/src/Glacier2/Makefile
@@ -29,7 +29,7 @@ OBJS		= Blobject.o \
 		  SessionRouterI.o \
                   $(SLICE_OBJS)
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index 791bbed83bc..7eab34ce886 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -36,7 +36,7 @@ OBJS		= $(LIB_OBJS) \
 HDIR		= $(headerdir)/IceBox
 SDIR		= $(slicedir)/IceBox
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index efb2d4397b9..7ff86f06937 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -96,7 +96,7 @@ OBJS		= $(ADMIN_OBJS) \
 
 SDIR		= $(slicedir)/IceGrid
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile
index 3d90ffd2bfb..0f98285f0a2 100644
--- a/cpp/src/IcePatch2/Makefile
+++ b/cpp/src/IcePatch2/Makefile
@@ -26,7 +26,7 @@ OBJS		= $(SOBJS) \
 		  $(COBJS) \
 		  $(CALCOBJS)
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index c2e13f23f8c..03f056c7f18 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -62,7 +62,7 @@ OBJS		= $(LIB_OBJS) \
 		  $(AOBJS) \
 		  $(MOBJS)
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 SLICE2FREEZECMD = $(SLICE2FREEZE) -I../.. --ice --include-dir IceStorm $(ICECPPFLAGS)
 
diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile
index 832031d87ef..5ad81d6a5e3 100644
--- a/cpp/src/slice2confluence/Makefile
+++ b/cpp/src/slice2confluence/Makefile
@@ -17,7 +17,7 @@ OBJS		= ConfluenceOutput.o \
 		  Gen.o \
 		  Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 540c8609532..fbc5f7430df 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -16,7 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index ed26cb5615c..38ff24ad63f 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -16,7 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index 938b75b50f2..437127d8768 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -15,7 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index 75709f97478..a15b090fc22 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -15,7 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile
index 91daaa61089..9e6fa3afe31 100644
--- a/cpp/src/slice2html/Makefile
+++ b/cpp/src/slice2html/Makefile
@@ -16,7 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index a70c830417a..80aef0db207 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -16,7 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2js/Makefile b/cpp/src/slice2js/Makefile
index 63053c3a533..7bbac96602b 100644
--- a/cpp/src/slice2js/Makefile
+++ b/cpp/src/slice2js/Makefile
@@ -17,7 +17,7 @@ OBJS		= Gen.o \
 		  JsUtil.o \
 		  Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile
index f2a7e6cb7a3..fb119c74be1 100644
--- a/cpp/src/slice2php/Makefile
+++ b/cpp/src/slice2php/Makefile
@@ -15,7 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index 3f003a08cbe..75f8d6ebbbe 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -15,7 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index b8029ca3a86..37f39017927 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/Makefile
@@ -15,7 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-RPATH_DIR	= @loader_path/../lib
+RPATH_DIR	= $(LOADER_PATH)/../lib
 
 include $(top_srcdir)/config/Make.rules