C++11 build updates

26 files changed, 49 insertions, 87 deletions

diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 61760bc51e4..ee6caa7f443 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME     = $(call mklibfilename,Freeze,$(VERSION))
 SONAME          = $(call mksoname,Freeze,$(SOVERSION))
 LIBNAME		= $(call mklibname,Freeze)
 
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS     = BackgroundSaveEvictor.o \
 		  CatalogData.o \
@@ -30,7 +30,7 @@ SLICE_OBJS     = BackgroundSaveEvictor.o \
 
 OBJS	        = BackgroundSaveEvictorI.o \
 		  Catalog.o \
-                  CatalogIndexList.o \
+		  CatalogIndexList.o \
 		  ConnectionI.o \
 		  EvictorI.o \
 		  EvictorIteratorI.o \
@@ -86,9 +86,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile
index 0278f75059f..a246ef80678 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile
@@ -14,7 +14,7 @@ LIBFILENAME     = $(call mklibfilename,Glacier2CryptPermissionsVerifier,$(VERSIO
 SONAME          = $(call mksoname,Glacier2CryptPermissionsVerifier,$(SOVERSION))  
 LIBNAME		= $(call mklibname,Glacier2CryptPermissionsVerifier)
 
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 OBJS		= CryptPermissionsVerifierI.o
 
@@ -34,9 +34,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile
index e8c97f89a2a..23f081a7895 100644
--- a/cpp/src/Glacier2Lib/Makefile
+++ b/cpp/src/Glacier2Lib/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME	= $(call mklibfilename,Glacier2,$(VERSION))
 SONAME		= $(call mksoname,Glacier2,$(SOVERSION))
 LIBNAME		= $(call mklibname,Glacier2)
 
-TARGETS 	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS 	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS      = Metrics.o \
 		  PermissionsVerifierF.o \
@@ -45,9 +45,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 702eda02254..a05ab5f8ae5 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -89,6 +89,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
     if(comma == string::npos)
     {
         libName = libSpec;
+#  ifdef ICE_CPP11
+        libName += "++11";
+#  endif
         if(useIceVersion)
         {
             int majorVersion = (ICE_INT_VERSION / 10000);
@@ -116,6 +119,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
             return 0;
         }
         libName = libSpec.substr(0, comma);
+#  ifdef ICE_CPP11
+        libName += "++11";
+#  endif
         version = libSpec.substr(comma + 1);
     }
 
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index e50882118c4..2d8066de082 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -12,7 +12,7 @@ top_srcdir	= ../..
 LIBFILENAME	= $(call mklibfilename,Ice,$(VERSION))
 SONAME		= $(call mksoname,Ice,$(SOVERSION))
 LIBNAME		= $(call mklibname,Ice)
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS	= BuiltinSequences.o \
 		  Communicator.o \
@@ -178,9 +178,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 endif
 
 install:: all
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index dacb05eefa4..78c1709581a 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -16,7 +16,7 @@ LIBNAME		= $(call mklibname,IceBox)
 SERVER		= $(bindir)/icebox
 ADMIN		= $(bindir)/iceboxadmin
 
-LIBTARGETS 	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+LIBTARGETS 	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 TARGETS   	= $(LIBTARGETS) $(SERVER) $(ADMIN)
 
 SLICE_OBJS      = IceBox.o
@@ -58,9 +58,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 $(SERVER): $(SOBJS) $(LIBTARGETS)
 	rm -f $@
diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile
index 14f2500a1e8..2bde0ac238a 100644
--- a/cpp/src/IceDiscovery/Makefile
+++ b/cpp/src/IceDiscovery/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME     = $(call mklibfilename,IceDiscovery,$(VERSION))
 SONAME          = $(call mksoname,IceDiscovery,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceDiscovery)
 
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS      = IceDiscovery.o
 
@@ -45,9 +45,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 endif
 
 ../IceDiscovery/IceDiscovery.h IceDiscovery.cpp: $(slicedir)/IceDiscovery/IceDiscovery.ice $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile
index 1feeaa5242d..00fba8870c8 100644
--- a/cpp/src/IceGridLib/Makefile
+++ b/cpp/src/IceGridLib/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME     = $(call mklibfilename,IceGrid,$(VERSION))
 SONAME          = $(call mksoname,IceGrid,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceGrid)
 
-LIBTARGETS	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+LIBTARGETS	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 TARGETS         = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN)
 
 SLICE_OBJS	= Admin.o \
@@ -52,9 +52,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile
index 386d81f4c8b..4a7b2c0d91b 100644
--- a/cpp/src/IcePatch2Lib/Makefile
+++ b/cpp/src/IcePatch2Lib/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME	= $(call mklibfilename,IcePatch2,$(VERSION))
 SONAME     	= $(call mksoname,IcePatch2,$(SOVERSION))
 LIBNAME		= $(call mklibname,IcePatch2)
 
-TARGETS   	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS   	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS	= FileInfo.o \
 		  FileServer.o
@@ -39,9 +39,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index f69a7491095..8f4a27549c2 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -14,7 +14,7 @@ LIBFILENAME	= $(call mklibfilename,IceSSL,$(VERSION))
 SONAME		= $(call mksoname,IceSSL,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceSSL)
 
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS	= ConnectionInfo.o \
 		  EndpointInfo.o
@@ -70,9 +70,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 endif
 
 install:: all
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index fa72cf7f38c..3fd0a382414 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -15,7 +15,7 @@ LIBNAME	     = $(call mklibname,IceStormService)
 
 ADMIN		= $(bindir)/icestormadmin
 MIGRATE		= $(bindir)/icestormmigrate
-LIBTARGETS   	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+LIBTARGETS   	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 TARGETS         = $(LIBTARGETS) $(ADMIN) $(MIGRATE)
 
 SLICE_OBJS	= Election.o \
@@ -85,9 +85,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 $(ADMIN): $(AOBJS) $(LIBTARGETS)
 	rm -f $@
diff --git a/cpp/src/IceStormLib/Makefile b/cpp/src/IceStormLib/Makefile
index 30c7fe7fa8b..042e317556e 100644
--- a/cpp/src/IceStormLib/Makefile
+++ b/cpp/src/IceStormLib/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME	= $(call mklibfilename,IceStorm,$(VERSION))
 SONAME 		= $(call mksoname,IceStorm,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceStorm)
 
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 SLICE_OBJS	= IceStorm.o \
 		  Metrics.o
@@ -38,9 +38,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile
index 12af8da0435..05656b1d7bd 100644
--- a/cpp/src/IceUtil/Makefile
+++ b/cpp/src/IceUtil/Makefile
@@ -12,7 +12,7 @@ top_srcdir	= ../..
 LIBFILENAME	= $(call mklibfilename,IceUtil,$(VERSION))
 SONAME		= $(call mksoname,IceUtil,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceUtil)
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 OBJS		= ArgVector.o \
 		  Cond.o \
@@ -56,9 +56,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 endif
 
 install:: all
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
index 718cbdc6c28..d0cbef06a1d 100644
--- a/cpp/src/IceXML/Makefile
+++ b/cpp/src/IceXML/Makefile
@@ -13,7 +13,7 @@ LIBFILENAME     = $(call mklibfilename,IceXML,$(VERSION))
 SONAME          = $(call mksoname,IceXML,$(SOVERSION))  
 LIBNAME		= $(call mklibname,IceXML)
 
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 OBJS		= Parser.o
 
@@ -31,9 +31,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index 106a8b988d4..bc9537cca4d 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -12,7 +12,7 @@ top_srcdir	= ../..
 LIBFILENAME	= $(call mklibfilename,Slice,$(VERSION))
 SONAME		= $(call mksoname,Slice,$(SOVERSION))
 LIBNAME		= $(call mklibname,Slice)
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
 OBJS		= Checksum.o \
 		  CPlusPlusUtil.o \
@@ -51,9 +51,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
 	rm -f $@
 	ln -s $(LIBFILENAME) $@
 
-$(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
+$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
 	rm -f $@
-	ln -s $(SONAME) $@
+	ln -s $(cpp11sonamedir)$(SONAME) $@
 
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile
index 844ef386a05..db70c2d80b1 100644
--- a/cpp/src/slice2confluence/Makefile
+++ b/cpp/src/slice2confluence/Makefile
@@ -17,11 +17,7 @@ OBJS		= ConfluenceOutput.o \
 		  Gen.o \
 		  Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 65808f83743..1e9aa32c9a5 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -16,11 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index dc94b636f50..d0d6ce059fb 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -16,11 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index 6192e579ea8..45e8c4289fa 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -15,11 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index 30ea0b225ef..03ea7f62cd5 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -15,11 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile
index b3703c7aee5..4b2128814a0 100644
--- a/cpp/src/slice2html/Makefile
+++ b/cpp/src/slice2html/Makefile
@@ -16,11 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 75e03f8f23c..ba97a371ad6 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -16,11 +16,7 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2js/Makefile b/cpp/src/slice2js/Makefile
index 7021fe86a31..4dbde860de1 100644
--- a/cpp/src/slice2js/Makefile
+++ b/cpp/src/slice2js/Makefile
@@ -17,11 +17,7 @@ OBJS		= Gen.o \
 		  JsUtil.o \
 		  Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile
index 0069a851fc1..0d5533355f4 100644
--- a/cpp/src/slice2php/Makefile
+++ b/cpp/src/slice2php/Makefile
@@ -15,11 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index 8af6e8bb382..edfa1da661c 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -15,11 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index 192c0db10c7..f82518a96db 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/Makefile
@@ -15,11 +15,7 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-ifeq ($(CPP11),yes)
-RPATH_DIR	= @loader_path/../../lib/c++11
-else
 RPATH_DIR	= @loader_path/../lib
-endif
 
 include $(top_srcdir)/config/Make.rules