diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-25 19:19:00 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-25 19:19:00 +0200 |
| commit | 1c1c87969f2d7328bb8d11a228bfed9e08b3a912 (patch) | |
| tree | 0253574142d8b1bd81506368ec089fa044e3e3db /ruby | |
| parent | ICE-6405 Fixed test status check on Windows (diff) | |
| download | ice-1c1c87969f2d7328bb8d11a228bfed9e08b3a912.tar.bz2 ice-1c1c87969f2d7328bb8d11a228bfed9e08b3a912.tar.xz ice-1c1c87969f2d7328bb8d11a228bfed9e08b3a912.zip | |
Fixed Python and Ruby build systems to allow running tests against binary distribution
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/config/Make.rules | 7 | ||||
| -rw-r--r-- | ruby/ruby/Makefile | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules index b070215d14e..a5c5925df75 100644 --- a/ruby/config/Make.rules +++ b/ruby/config/Make.rules @@ -132,7 +132,6 @@ endif # ice_language = ruby ice_require_cpp = yes -slice_translator = slice2rb ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0) include $(top_srcdir)/config/Make.common.rules @@ -192,10 +191,10 @@ LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) ifdef ice_src_dist SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2RB = $(ice_cpp_dir)/$(binsubdir)/$(slice_translator) + SLICE2RB = $(top_srcdir)/config/s2rb.rb else - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2RB = $(ice_dir)/$(binsubdir)/$(slice_translator) + SLICEPARSERLIB = + SLICE2RB = slice2rb endif EVERYTHING = all depend clean install diff --git a/ruby/ruby/Makefile b/ruby/ruby/Makefile index 884486b85b0..da3b3d11ab4 100644 --- a/ruby/ruby/Makefile +++ b/ruby/ruby/Makefile @@ -115,7 +115,6 @@ MODULES = Glacier2 Ice IceBox IceGrid IcePatch2 IceStorm all:: $(ALL_SRCS) -SLICE2RB = $(top_srcdir)/config/s2rb.rb SLICE2RBFLAGS += --ice Ice/%.rb: $(slicedir)/Ice/%.ice $(SLICE2RB) $(SLICEPARSERLIB) |