summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distribution/src/common/Make.rules10
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