--- python/config/Make.rules.orig	2019-08-12 19:54:18 UTC
+++ python/config/Make.rules
@@ -11,7 +11,8 @@
 # Select an installation base directory. The directory will be created
 # if it does not exist.
 #
-prefix			?= /opt/Ice-$(VERSION)
+ICE_HOME		= %%LOCALBASE%%
+prefix			?= %%PREFIX%%
 
 #
 # The "root directory" for runpath embedded in executables. Can be set
@@ -50,7 +51,7 @@ embedded_runpath 	?= yes
 # version used for building the Ice extension, then set PYTHON to
 # the specific to the location of the python interpreter.
 #
-PYTHON              ?= python
+PYTHON              ?= %%PYTHON_CMD%%
 
 PYTHON_VERSION      ?= python$(shell $(PYTHON) -c "import sys; import distutils.sysconfig as ds; sys.stdout.write(ds.get_python_version())")
 
@@ -105,16 +106,16 @@ endif
 
 libdir                  = $(top_srcdir)/python
 
-ifndef usr_dir_install
-    install_pythondir	= $(prefix)/python
-    install_libdir	= $(prefix)/python
-else
+#ifndef usr_dir_install
+#    install_pythondir	= $(prefix)/python
+#    install_libdir	= $(prefix)/python
+#else
     #
     # The install_dir script says where python wants site-packages installed.
     #
-    install_pythondir 	= $(shell $(PYTHON) $(top_srcdir)/config/install_dir)
-    install_libdir 	= $(install_pythondir)
-endif
+    install_pythondir = %%PYTHON_SITELIBDIR%%/Ice
+    install_libdir = %%PYTHON_SITELIBDIR%%/Ice
+#endif
 
 ifeq ($(UNAME),SunOS)
     ifeq ($(LP64),yes)
@@ -123,15 +124,11 @@ ifeq ($(UNAME),SunOS)
     endif
 endif
 
-ifdef ice_src_dist
-    ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir)
-    ICE_FLAGS 	= -I$(ice_cpp_dir)/include
-else
-    ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
-    ICE_FLAGS	= -I$(ice_dir)/include
-endif
-ICE_LIBS = $(ICE_LIB_DIR) -lIceLocatorDiscovery -lIceDiscovery -lIceSSL -lIce -lSlice -lIceUtil
 
+ICE_LIB_DIR	= -L%%LOCALBASE%%/$(libsubdir)
+ICE_FLAGS	= -I%%LOCALBASE%%/include
+ICE_LIBS	= $(ICE_LIB_DIR) -lIceLocatorDiscovery -lIceDiscovery -lIceSSL -lIce -lSlice -lIceUtil %%ICONV_LIB%%
+
 CPPFLAGS		=
 ICECPPFLAGS		= -I$(slicedir)
 SLICE2PYFLAGS	= $(ICECPPFLAGS)
@@ -143,10 +140,7 @@ endif
 
 ifdef ice_src_dist
     SLICE2PY    = $(PYTHON) $(top_srcdir)/config/s2py.py
-    SLICEPARSERLIB	= $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION))
-    ifeq ($(wildcard $(SLICEPARSERLIB)),)
-        SLICEPARSERLIB  = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION))
-    endif
+    SLICEPARSERLIB	= /usr/local/lib/$(call mklibfilename,Slice,$(VERSION))
 else
     ifeq ($(UNAME),Darwin)
         SLICE2PY = /usr/local/bin/slice2py
@@ -177,7 +171,7 @@ EVERYTHING	= all depend clean install
 
 all:: $(SRCS)
 
-%_ice.py: $(slicedir)/%.ice
+%_ice.py: $(ICE_HOME)/%.ice
 	rm -f $(*F).py
 	$(SLICE2PY) $(SLICE2PYFLAGS) $<
 	@mkdir -p .depend