diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-11-08 21:55:17 -0330 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-11-08 21:55:17 -0330 |
| commit | 0afc8682df16c5698810d55b7d6a853ea8829339 (patch) | |
| tree | 9bfe78bd4be02614f6ec1cb137c56c6d77e4999e /py | |
| parent | - Adding root makefile for Windows and UNIX. (diff) | |
| download | ice-0afc8682df16c5698810d55b7d6a853ea8829339.tar.bz2 ice-0afc8682df16c5698810d55b7d6a853ea8829339.tar.xz ice-0afc8682df16c5698810d55b7d6a853ea8829339.zip | |
Fix a problem when building in a git repository or source distribution
with ICE_HOME set to root/cpp.
Diffstat (limited to 'py')
| -rw-r--r-- | py/config/Make.rules | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/py/config/Make.rules b/py/config/Make.rules index a9fcf5944d9..af6b8069a44 100644 --- a/py/config/Make.rules +++ b/py/config/Make.rules @@ -13,6 +13,8 @@ # USE_ICE_RPM ?= 0 +USE_SRC_DIST = 0 + ifneq ($(ICE_HOME),) ifeq ($(USE_ICE_RPM), 1) $(error Ambiguous directives. Both ICE_HOME and USE_ICE_RPM are defined.) @@ -20,14 +22,14 @@ $(error Ambiguous directives. Both ICE_HOME and USE_ICE_RPM are defined.) ICE_DIR = $(ICE_HOME) - ifeq ($(shell test -f $(ICE_DIR)/bin/slice2py && echo 0),0) + ifneq ($(shell test -f $(ICE_DIR)/bin/slice2py && echo 0),0) $(error Unable to locate slice2py in $(ICE_DIR). Please verify ICE_HOME is properly configured and Ice is correctly installed.) endif else ifeq ($(USE_ICE_RPM),1) ICE_DIR=/usr - ifeq ($(shell test -f $(ICE_DIR)/bin/slice2py && echo 0),0) + ifneq ($(shell test -f $(ICE_DIR)/bin/slice2py && echo 0),0) $(error Unable to locate slice2py in $(ICE_DIR). Please verify that the required Ice RPMs are properly installed.) endif else @@ -173,7 +175,11 @@ endif ifneq ($(USE_ICE_RPM),0) slicedir = /usr/share/Ice-$(VERSION)/slice else - slicedir = $(ICE_DIR)/slice + ifeq ($(shell test -d $(ICE_DIR)/slice && echo 0),0) + slicedir = $(ICE_DIR)/slice + else + slicedir = $(ICE_DIR)/../slice + endif endif install_libdir = $(prefix)/python @@ -264,7 +270,7 @@ EVERYTHING = all depend clean install all:: $(SRCS) -%_ice.py: $(SDIR)/%.ice +%_ice.py: $(slicedir)/%.ice rm -f $(*F).py $(SLICE2PY) $(SLICE2PYFLAGS) $< |