diff options
| author | Jose <jose@zeroc.com> | 2014-10-24 20:56:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-24 20:56:42 +0200 |
| commit | aa93dabf90667a42ae99bb2c2837516fa8f2741a (patch) | |
| tree | 452433d77eef34eb0d85fb7f86872b2467aa3b6d /cpp/src/IceGridLib | |
| parent | ICE-5776 java build failure on RHEL (diff) | |
| download | ice-aa93dabf90667a42ae99bb2c2837516fa8f2741a.tar.bz2 ice-aa93dabf90667a42ae99bb2c2837516fa8f2741a.tar.xz ice-aa93dabf90667a42ae99bb2c2837516fa8f2741a.zip | |
C++11 build updates
Diffstat (limited to 'cpp/src/IceGridLib')
| -rw-r--r-- | cpp/src/IceGridLib/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
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)) |