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/IceUtil | |
| 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/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index 12af8da0435..05656b1d7bd 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -12,7 +12,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) SONAME = $(call mksoname,IceUtil,$(SOVERSION)) LIBNAME = $(call mklibname,IceUtil) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) OBJS = ArgVector.o \ Cond.o \ @@ -56,9 +56,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) $@ endif install:: all |