diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-01-11 19:10:29 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-01-11 19:10:29 +0000 |
| commit | 968a4c311cf4f08fe507890ba9dccd45b1511c5f (patch) | |
| tree | 3329c27f319df892635032c074f101a93f5976e2 | |
| parent | file README.txt was initially added on branch R3_0_branch. (diff) | |
| download | ice-968a4c311cf4f08fe507890ba9dccd45b1511c5f.tar.bz2 ice-968a4c311cf4f08fe507890ba9dccd45b1511c5f.tar.xz ice-968a4c311cf4f08fe507890ba9dccd45b1511c5f.zip | |
Merge from R3_0_branch
| -rw-r--r-- | py/config/Make.rules | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/py/config/Make.rules b/py/config/Make.rules index 2142ee3ac80..f962bfe9cbd 100644 --- a/py/config/Make.rules +++ b/py/config/Make.rules @@ -81,8 +81,14 @@ endif PYTHON_FLAGS ?= -I$(PYTHON_INCLUDE_DIR) PYTHON_LIBS ?= -L$(PYTHON_LIB_DIR) -l$(PYTHON_VERSION) -ICE_FLAGS ?= -I$(ICE_HOME)/include -ICE_LIBS ?= -L$(ICE_HOME)/lib -lIce -lIceUtil -lSlice +ifeq ($(LP64),yes) + ICE_LIBS = -L$(ICE_HOME)/lib64 -L$(ICE_HOME)/lib -lIce -lIceUtil -lSlice +else + ICE_LIBS = -L$(ICE_HOME)/lib -lIce -lIceUtil -lSlice +endif + +ICE_FLAGS = -I$(ICE_HOME)/include + # ---------------------------------------------------------------------- @@ -90,7 +96,7 @@ ICE_LIBS ?= -L$(ICE_HOME)/lib -lIce -lIceUtil -lSlice # ---------------------------------------------------------------------- SHELL = /bin/sh -VERSION = 3.0.0 +VERSION = 3.0.1 SOVERSION = 30 libdir = $(top_srcdir)/python |