diff options
| author | Jose <jose@zeroc.com> | 2014-11-19 19:55:42 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-19 19:55:42 +0100 |
| commit | 2cf9b69e19059ac17177140488b1f263346fafcc (patch) | |
| tree | 07cfa4d5597ab5b9f74f8c5822e3e59f11cffabc | |
| parent | ICE-5478 rename html files to index.html for silverlight demos (diff) | |
| download | ice-2cf9b69e19059ac17177140488b1f263346fafcc.tar.bz2 ice-2cf9b69e19059ac17177140488b1f263346fafcc.tar.xz ice-2cf9b69e19059ac17177140488b1f263346fafcc.zip | |
C++11 demo distribution build fix
| -rw-r--r-- | distribution/src/common/Make.rules | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/distribution/src/common/Make.rules b/distribution/src/common/Make.rules index 656938a976e..83df85ef0dd 100644 --- a/distribution/src/common/Make.rules +++ b/distribution/src/common/Make.rules @@ -92,7 +92,7 @@ ifeq ($(ice_dir), /usr) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) else CPPFLAGS += -I$(includedir) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix) + LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) endif ifeq ($(FLEX_NOLINE),yes) @@ -111,10 +111,10 @@ ifeq ($(mkshlib),) $(error You need to define mkshlib in Make.rules.$(UNAME)) endif -SLICEPARSERLIB = $(ice_dir)/$(libsubdir)$(cpp11suffix)/$(call mklibfilename,Slice,$(VERSION)) -SLICE2CPP = $(ice_dir)/$(binsubdir)$(cpp11suffix)/slice2cpp -SLICE2FREEZE = $(ice_dir)/$(binsubdir)$(cpp11suffix)/slice2freeze -RPATH_DIR = $(ice_dir)/$(libsubdir)$(cpp11suffix) +SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION))) +SLICE2CPP = $(ice_dir)/$(binsubdir)/slice2cpp +SLICE2FREEZE = $(ice_dir)/$(binsubdir)/slice2freeze +RPATH_DIR = $(ice_dir)/$(libsubdir) EVERYTHING = all clean EVERYTHING_EXCEPT_ALL = clean |