diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-27 09:12:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-27 09:12:52 +0200 |
| commit | 1fd0f8d00331af8856964d9aaadc2e4c6adedadc (patch) | |
| tree | 8f050fe1960328b69a5bbe25288fa8bac9da0d22 /python | |
| parent | Fix location of slice2py for Linux bindist build (diff) | |
| download | ice-1fd0f8d00331af8856964d9aaadc2e4c6adedadc.tar.bz2 ice-1fd0f8d00331af8856964d9aaadc2e4c6adedadc.tar.xz ice-1fd0f8d00331af8856964d9aaadc2e4c6adedadc.zip | |
Better fix to figure out location of slice2py on Linux platforms
Diffstat (limited to 'python')
| -rw-r--r-- | python/config/Make.rules | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/python/config/Make.rules b/python/config/Make.rules index a3a2e17251c..c14c7172abf 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -142,18 +142,18 @@ SLICE2PYFLAGS = $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) ifdef ice_src_dist - SLICE2PY = $(top_srcdir)/config/s2py.py + SLICE2PY = $(top_srcdir)/config/s2py.py SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) + SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) endif else ifeq ($(UNAME),Darwin) - SLICE2PY = /usr/local/bin/slice2py + SLICE2PY = /usr/local/bin/slice2py else - SLICE2PY = /usr/bin/slice2py + SLICE2PY = $(shell $(PYTHON) -c "import os, sys, slice2py; sys.stdout.write(os.path.normpath(os.path.join(slice2py.__file__, '..', '..', '..', '..', 'bin', 'slice2py')))") endif - SLICEPARSERLIB = + SLICEPARSERLIB = endif # |