1 --- anaconda-11.0.5/Makefile.inc~ 2005-06-13 22:09:23.000000000 +0300
2 +++ anaconda-11.0.5/Makefile.inc 2006-05-18 22:34:08.000000000 +0300
5 # define destination locations
7 -PYTHONLIBDIR = /usr/lib/anaconda
8 -RUNTIMEDIR = /usr/lib/anaconda-runtime
9 +PYTHONLIBDIR = /usr/$(LIBDIR)/anaconda
10 +RUNTIMEDIR = /usr/$(LIBDIR)/anaconda-runtime
11 ANACONDADATADIR = /usr/share/anaconda
13 PYTHONINCLUDE = /usr/include/$(PYTHON)
14 --- ./anaconda~ 2006-05-18 23:34:39.000000000 +0300
15 +++ ./anaconda 2006-05-18 23:48:57.000000000 +0300
18 # handle updates of just a single file in a python package
19 def setupPythonUpdates():
22 - # get the python version. first of /usr/lib/python*, strip off the
24 - pyvers = glob.glob("/usr/lib/python*")
25 - pyver = pyvers[0][15:]
26 + pyver = sys.version[:3]
29 os.mkdir("/tmp/updates")
32 for pypkg in ("rhpl", "yum", "rpmUtils", "urlgrabber", "repomd",
33 "pykickstart", "rhpxl"):
34 - # get the libdir. *sigh*
35 - if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
42 if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK):
45 sys.path.append('textw')
48 - sys.path.append('/usr/lib/anaconda')
49 - sys.path.append('/usr/lib/anaconda/textw')
50 - sys.path.append('/usr/lib/anaconda/iw')
51 + sys.path.append('/usr/%s/anaconda' % sys.lib)
52 + sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
53 + sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
55 if (os.path.exists('booty')):
56 sys.path.append('booty')
57 sys.path.append('booty/edd')
59 - sys.path.append('/usr/lib/booty')
60 + sys.path.append('/usr/%s/booty' % sys.lib)
62 sys.path.append('/usr/share/system-config-keyboard')
63 sys.path.append('/usr/share/system-config-date')