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/slice2java | |
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/slice2java')
-rw-r--r-- | cpp/src/slice2java/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |