bitkeeper revision 1.1159.170.89 (41e4ef8aHmcX3lP2zVDZBpN59cSX6A)

Python packages always install to ${prefix}/us/lib/python/xen/...

diff --git a/tools/misc/netfix b/tools/misc/netfix
index 0c1d5f587523872541c5b6926d5942f54afd1c2b..ab5a04cdefc270f1e39e6f4c99150668887a5980 100644 (file)
--- a/tools/misc/netfix
+++ b/tools/misc/netfix
@@ -10,7 +10,7 @@
 from getopt import getopt
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.util.Brctl import *
 
 short_options = 'hvqni:b:c'

diff --git a/tools/misc/xend b/tools/misc/xend
index 728cb2aaabed81b36e5439f601dba663b1ea6483..d19a4868f6391e0efddc5911b9f4e0c04aa9f4a0 100644 (file)
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -23,7 +23,7 @@ import os
 import sys
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.xend.server import SrvDaemon
 
 class CheckError(ValueError):

diff --git a/tools/misc/xensv b/tools/misc/xensv
index 5b2608a2d6482a647d0c9ff406ba40d6315c9ab1..7924840615a2fef8cfb5cee649904c6e4b9bbb6d 100755 (executable)
--- a/tools/misc/xensv
+++ b/tools/misc/xensv
@@ -23,7 +23,7 @@ import sys
 import re
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.xend.server.params import XEND_PID_FILE
 
 class CheckError(ValueError):

diff --git a/tools/misc/xm b/tools/misc/xm
index 10b631100ac13323f9579d3b7cc53012ad1604be..86e45573d038c6d7b8a322389078ce399d78ec1d 100755 (executable)
--- a/tools/misc/xm
+++ b/tools/misc/xm
@@ -3,7 +3,7 @@
 import sys
 
 # Default install path for Xen binary packages.
-sys.path.append('/lib/python')
+sys.path = [ '/usr/lib/python' ] + sys.path
 from xen.xm import main
 
 main.main(sys.argv)

diff --git a/tools/python/Makefile b/tools/python/Makefile
index 7dc74a1072e474446c643820df9ff57df01bd426..a3f4face53fc2730bd11da036ea146980e330191 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -3,13 +3,7 @@ all:
        python setup.py build
 
 install: all
-       if [ "$(prefix)" = "" ]; then                   \
-           python setup.py install;                    \
-       elif [ "$(dist)" = "yes" ]; then                \
-           python setup.py install --home="$(prefix)"; \
-       else                                            \
-           python setup.py install --root="$(prefix)"; \
-       fi
+       python setup.py install --home="$(prefix)/usr"
 
 clean:
        rm -rf build *.pyc *.pyo *.o *.a *~