diff options
| author | Jose <jose@zeroc.com> | 2014-11-24 18:37:34 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-24 18:37:34 +0100 |
| commit | ad7fbc43e88f66b8dfe37e8d0c70e95351570bc7 (patch) | |
| tree | 26372de098725f6b65efe56c38f5831dd2f5b974 /cpp/src | |
| parent | Fixed ICE-5969: IceGrid/allocation test failure (diff) | |
| download | ice-ad7fbc43e88f66b8dfe37e8d0c70e95351570bc7.tar.bz2 ice-ad7fbc43e88f66b8dfe37e8d0c70e95351570bc7.tar.xz ice-ad7fbc43e88f66b8dfe37e8d0c70e95351570bc7.zip | |
Build & test fixes:
* ICE-5929 - Consider using $ORIGIN on Linux
* ICE-5949 - IceBox issues on Linux bi-arch
* ICE-5954 - Ubuntu make install issue / ORIGIN bug
* ICE-5961 - OSX: test/IceGrid/session fails
* ICE-5971 - allTests.py incorrect reporting under Windows?
Diffstat (limited to 'cpp/src')
29 files changed, 51 insertions, 19 deletions
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 558d92553f7..33be9920e99 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -79,6 +79,7 @@ clean:: -rm -f $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -87,6 +88,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index 04d83e89767..2d11448977d 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile index 1f0de439f88..25f6596236d 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile index 93b235065de..891d79f5072 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile @@ -27,6 +27,7 @@ CPPFLAGS := -I.. $(CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil -lGlacier2 $(ICEUTIL_OS_LIBS) $(CXXLIBS) $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -35,6 +36,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile index 23f081a7895..78b574ba92b 100644 --- a/cpp/src/Glacier2Lib/Makefile +++ b/cpp/src/Glacier2Lib/Makefile @@ -38,6 +38,7 @@ SLICE2CPPFLAGS := --ice --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(OBJS) $(HDIR)/PermissionsVerifierF.h $(HDIR)/RouterF.h + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -46,6 +47,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 2d8066de082..ec649e429ed 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -167,10 +167,12 @@ LINKWITH := -lIceUtil $(BZIP2_LIBS) $(ICE_OS_LIBS) $(ICONV_LIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mklib,$@,$(OBJS)) else $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -179,6 +181,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ endif diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index 7eab34ce886..15385b77972 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -13,7 +13,7 @@ LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION)) SONAME = $(call mksoname,IceBox,$(SOVERSION)) LIBNAME = $(call mklibname,IceBox) -SERVER = $(bindir)/icebox +SERVER = $(bindir)/icebox$(binsuffix) ADMIN = $(bindir)/iceboxadmin LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) @@ -36,7 +36,7 @@ OBJS = $(LIB_OBJS) \ HDIR = $(headerdir)/IceBox SDIR = $(slicedir)/IceBox -RPATH_DIR = $(LOADER_PATH)/../lib +RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) include $(top_srcdir)/config/Make.rules @@ -45,6 +45,7 @@ SLICE2CPPFLAGS := --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(LIB_OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(LIB_OBJS),$(LINKWITH)) @@ -53,6 +54,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ @@ -66,7 +68,7 @@ $(ADMIN): $(AOBJS) $(LIBTARGETS) install:: all $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir)/icebox$(binsuffix)) + $(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir)) $(call installdata,$(top_srcdir)/../man/man1/icebox.1,$(DESTDIR)$(install_mandir)) $(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir)) $(call installdata,$(top_srcdir)/../man/man1/iceboxadmin.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile index db632cfa43b..e1a2651c114 100644 --- a/cpp/src/IceDiscovery/Makefile +++ b/cpp/src/IceDiscovery/Makefile @@ -34,10 +34,12 @@ LINKWITH := -lIce -lIceUtil $(CXXLIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mklib,$@,$(OBJS)) else $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -46,6 +48,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ endif diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 7ff86f06937..1078db19f7a 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile index 00fba8870c8..bd5c1c34b37 100644 --- a/cpp/src/IceGridLib/Makefile +++ b/cpp/src/IceGridLib/Makefile @@ -45,6 +45,7 @@ SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_ LINKWITH := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -53,6 +54,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile index 0f98285f0a2..561db91da8e 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile index 4a7b2c0d91b..fa6e700ec04 100644 --- a/cpp/src/IcePatch2Lib/Makefile +++ b/cpp/src/IcePatch2Lib/Makefile @@ -32,6 +32,7 @@ SLICE2CPPFLAGS := --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SL LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(BZIP2_LIBS) $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index 8f4a27549c2..c06d4dfb6a0 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -59,10 +59,12 @@ LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mklib,$@,$(OBJS)) else $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -71,6 +73,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ endif diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 03f056c7f18..da76317f5ed 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)/../$(libsubdir) SLICE2FREEZECMD = $(SLICE2FREEZE) -I../.. --ice --include-dir IceStorm $(ICECPPFLAGS) @@ -74,6 +74,7 @@ SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIceStorm -lIceGrid -lGlacier2 -lFreeze -lIceBox -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(LIB_OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(LIB_OBJS),$(LINKWITH)) @@ -82,6 +83,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/IceStormLib/Makefile b/cpp/src/IceStormLib/Makefile index 042e317556e..687050759d2 100644 --- a/cpp/src/IceStormLib/Makefile +++ b/cpp/src/IceStormLib/Makefile @@ -31,6 +31,7 @@ SLICE2CPPFLAGS := --ice --include-dir IceStorm --checksum --dll-export ICE_STORM LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -39,6 +40,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index 05656b1d7bd..69a91347364 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -45,10 +45,12 @@ LINKWITH := $(ICEUTIL_OS_LIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mklib,$@,$(OBJS)) else $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -57,6 +59,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ endif diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile index d0cbef06a1d..86d6f6a599e 100644 --- a/cpp/src/IceXML/Makefile +++ b/cpp/src/IceXML/Makefile @@ -24,6 +24,7 @@ CPPFLAGS := -I.. $(CPPFLAGS) -DICE_XML_API_EXPORTS $(EXPAT_FLAGS) LINKWITH := -lIceUtil $(EXPAT_LIBS) $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -32,6 +33,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index bc9537cca4d..7984f5ee64b 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -40,10 +40,12 @@ BISONFLAGS := --name-prefix "slice_" $(BISONFLAGS) LINKWITH := $(BASELIBS) $(MCPP_LIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mklib,$@,$(OBJS)) else $(libdir)/$(LIBFILENAME): $(OBJS) + @mkdir -p $(dir $@) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -52,6 +54,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) ln -s $(LIBFILENAME) $@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) + @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index 5ad81d6a5e3..577af8ca124 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index fbc5f7430df..fa5112ed87f 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile index 38ff24ad63f..0c8f1067c7c 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile index 437127d8768..e5c304aa616 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile index a15b090fc22..706c41d6971 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile index 9e6fa3afe31..003a6a082fb 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile index 80aef0db207..28412cc394d 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2js/Makefile b/cpp/src/slice2js/Makefile index 7bbac96602b..7705e3faf0d 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile index fb119c74be1..c3cb3cad72d 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile index 75f8d6ebbbe..bf7e2e83d9b 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile index 37f39017927..080e386a6ca 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)/../$(libsubdir) include $(top_srcdir)/config/Make.rules |