summaryrefslogtreecommitdiff
path: root/py/python/Ice.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2015-02-18 10:29:49 -0330
committerMatthew Newhook <matthew@zeroc.com>2015-02-18 10:29:49 -0330
commitb55ce15878456e3d2f0656bcd6abd5a55c6774b1 (patch)
treee7e771a3d90ae7295f20bf0622b72c72cc3a85e0 /py/python/Ice.py
parentFixed ObjC build (diff)
downloadice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.bz2
ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.xz
ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.zip
Changes for brew, python PyPI packaging and ruby gem packaging.
Diffstat (limited to 'py/python/Ice.py')
-rw-r--r--py/python/Ice.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py
index 7133fd5956f..ef8c253d829 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -294,6 +294,14 @@ def getSliceDir():
'''Convenience function for locating the directory containing the Slice files.'''
#
+ # Detect setup.py installation in site-packages. The slice
+ # files live along side Ice.py
+ #
+ dir = os.path.join(os.path.dirname(__file__), "slice")
+ if os.path.isdir(dir):
+ return dir
+
+ #
# Get the parent of the directory containing this file (Ice.py).
#
pyHome = os.path.join(os.path.dirname(__file__), "..")