ia64/xen-unstable

changeset 3423:f43ba601eca1

bitkeeper revision 1.1159.217.10 (41e4efd62HR6KHx5S8553JDf-xT3zg)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Jan 12 09:37:26 2005 +0000 (2005-01-12)
parents 9a92e168d231 3552b3979933
children 1c8e5bc858f0 60d564971e17
files tools/misc/netfix tools/misc/xend tools/misc/xensv tools/misc/xm tools/python/Makefile
line diff
     1.1 --- a/tools/misc/netfix	Wed Jan 12 09:13:37 2005 +0000
     1.2 +++ b/tools/misc/netfix	Wed Jan 12 09:37:26 2005 +0000
     1.3 @@ -10,7 +10,7 @@
     1.4  from getopt import getopt
     1.5  
     1.6  # Default install path for Xen binary packages.
     1.7 -sys.path.append('/lib/python')
     1.8 +sys.path = [ '/usr/lib/python' ] + sys.path
     1.9  from xen.util.Brctl import *
    1.10  
    1.11  short_options = 'hvqni:b:c'
     2.1 --- a/tools/misc/xend	Wed Jan 12 09:13:37 2005 +0000
     2.2 +++ b/tools/misc/xend	Wed Jan 12 09:37:26 2005 +0000
     2.3 @@ -29,7 +29,7 @@ XCS_EXEC = "/usr/sbin/xcs"
     2.4  XCS_LOGFILE = "/var/log/xcs.log"
     2.5  
     2.6  # Default install path for Xen binary packages.
     2.7 -sys.path.append('/lib/python')
     2.8 +sys.path = [ '/usr/lib/python' ] + sys.path
     2.9  from xen.xend.server import SrvDaemon
    2.10  
    2.11  class CheckError(ValueError):
     3.1 --- a/tools/misc/xensv	Wed Jan 12 09:13:37 2005 +0000
     3.2 +++ b/tools/misc/xensv	Wed Jan 12 09:37:26 2005 +0000
     3.3 @@ -23,7 +23,7 @@ import sys
     3.4  import re
     3.5  
     3.6  # Default install path for Xen binary packages.
     3.7 -sys.path.append('/lib/python')
     3.8 +sys.path = [ '/usr/lib/python' ] + sys.path
     3.9  from xen.xend.server.params import XEND_PID_FILE
    3.10  
    3.11  class CheckError(ValueError):
     4.1 --- a/tools/misc/xm	Wed Jan 12 09:13:37 2005 +0000
     4.2 +++ b/tools/misc/xm	Wed Jan 12 09:37:26 2005 +0000
     4.3 @@ -3,7 +3,7 @@
     4.4  import sys
     4.5  
     4.6  # Default install path for Xen binary packages.
     4.7 -sys.path.append('/lib/python')
     4.8 +sys.path = [ '/usr/lib/python' ] + sys.path
     4.9  from xen.xm import main
    4.10  
    4.11  main.main(sys.argv)
     5.1 --- a/tools/python/Makefile	Wed Jan 12 09:13:37 2005 +0000
     5.2 +++ b/tools/python/Makefile	Wed Jan 12 09:37:26 2005 +0000
     5.3 @@ -3,13 +3,7 @@ all:
     5.4  	python setup.py build
     5.5  
     5.6  install: all
     5.7 -	if [ "$(prefix)" = "" ]; then                   \
     5.8 -	    python setup.py install;                    \
     5.9 -	elif [ "$(dist)" = "yes" ]; then                \
    5.10 -	    python setup.py install --home="$(prefix)"; \
    5.11 -	else                                            \
    5.12 -	    python setup.py install --root="$(prefix)"; \
    5.13 -	fi
    5.14 +	python setup.py install --home="$(prefix)/usr"
    5.15  
    5.16  clean:
    5.17  	rm -rf build *.pyc *.pyo *.o *.a *~