4a4abb5f7f
PR: 148492 Submitted by: Tony Maher <tonymaher@optusnet.com.au> Approved by: maintainer timeout
32 lines
923 B
Text
32 lines
923 B
Text
--- py/config/Make.rules.orig 2010-07-11 11:13:30.000000000 +1000
|
|
+++ py/config/Make.rules 2010-07-11 11:18:09.000000000 +1000
|
|
@@ -12,7 +12,8 @@
|
|
# if it does not exist.
|
|
#
|
|
|
|
-prefix ?= /opt/Ice-$(VERSION)
|
|
+ICE_HOME = %%LOCALBASE%%
|
|
+prefix ?= %%PREFIX%%
|
|
|
|
#
|
|
# The "root directory" for runpath embedded in executables. Can be unset
|
|
@@ -80,8 +81,8 @@
|
|
endif
|
|
|
|
libdir = $(top_srcdir)/python
|
|
-install_pythondir = $(prefix)/python
|
|
-install_libdir = $(prefix)/python
|
|
+install_pythondir = %%PYTHON_SITELIBDIR%%/Ice
|
|
+install_libdir = %%PYTHON_SITELIBDIR%%/Ice
|
|
|
|
#
|
|
# Platform specific definitions
|
|
@@ -105,7 +106,7 @@
|
|
ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
|
|
ICE_FLAGS = -I$(ice_dir)/include
|
|
endif
|
|
-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
|
|
+ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv
|
|
|
|
ifneq ($(embedded_runpath_prefix),)
|
|
runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir)
|