diff options
| -rw-r--r-- | tools/misc/netfix | 2 | ||||
| -rw-r--r-- | tools/misc/xend | 2 | ||||
| -rwxr-xr-x | tools/misc/xensv | 2 | ||||
| -rwxr-xr-x | tools/misc/xm | 2 | ||||
| -rw-r--r-- | tools/python/Makefile | 8 |
5 files changed, 5 insertions, 11 deletions
diff --git a/tools/misc/netfix b/tools/misc/netfix index 0c1d5f5875..ab5a04cdef 100644 --- 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 728cb2aaab..d19a4868f6 100644 --- 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 5b2608a2d6..7924840615 100755 --- 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 10b631100a..86e45573d0 100755 --- 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 7dc74a1072..a3f4face53 100644 --- 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 *~ |