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/IceBox | |
| 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/IceBox')
| -rw-r--r-- | cpp/src/IceBox/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
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)) |