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