--- config/Make.rules.orig Thu Jul 6 20:35:10 2006 +++ config/Make.rules Thu Aug 3 21:15:07 2006 @@ -7,6 +7,8 @@ # # ********************************************************************** +ICE_HOME = %%LOCALBASE%% + ifndef ICE_HOME $(error ICE_HOME is not defined) endif @@ -16,7 +18,7 @@ # if it does not exist. # -prefix = /opt/IcePy-$(VERSION) +prefix = %%PREFIX%% # # When creating an executable, shall we add install_libdir to the @@ -68,13 +70,13 @@ # version used for building the Ice extension, then set PYTHON_VERSION # to "python2.3" or "python2.4". # - PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard /usr/include/python2.[34]*))) + PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard %%LOCALBASE%%/include/python2.[34]*))) ifeq ($(PYTHON_VERSION),) python_darwin_home = /System/Library/Frameworks/Python.framework/Versions/Current PYTHON_VERSION = $(word 1,$(notdir $(wildcard $(python_darwin_home)/include/python2.[34]*))) endif - PYTHON_INCLUDE_DIR = /usr/include/$(PYTHON_VERSION) - PYTHON_LIB_DIR = /usr/lib/$(PYTHON_VERSION)/config + PYTHON_INCLUDE_DIR = %%LOCALBASE%%/include/$(PYTHON_VERSION) + PYTHON_LIB_DIR = %%LOCALBASE%%/lib/$(PYTHON_VERSION) endif ifeq ($(PYTHON_VERSION),) @@ -109,21 +111,21 @@ slicedir = $(ICE_HOME)/slice endif -ifeq ($(LP64),yes) +#ifeq ($(LP64),yes) # # TODO: Where should the shared library be installed if it is a 64 bit # build. # - install_libdir = $(prefix)/python -else - install_libdir = $(prefix)/python -endif +# install_libdir = $(prefix)/python +#else + install_libdir = %%PYTHON_SITELIBDIR%%/Ice +#endif install_slicedir = $(prefix)/slice -install_pythondir = $(prefix)/python +install_pythondir = %%PYTHON_SITELIBDIR%%/Ice -INSTALL = cp -fp -INSTALL_PROGRAM = ${INSTALL} +INSTALL = install -C -o root -g wheel -m 444 +INSTALL_PROGRAM = install -C -s -o root -g wheel -m 555 INSTALL_LIBRARY = ${INSTALL} INSTALL_DATA = ${INSTALL}