projects / packages / anaconda.git / blame
| Commit | Line | Data |
|---|---|---|
| 322a3102 ER |
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 | |
| 3 | @@ -1,8 +1,8 @@ | |
| 4 | # | |
| 5 | # define destination locations | |
| 6 | # | |
| 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 | |
| 12 | PYTHON = python2.4 | |
| 13 | PYTHONINCLUDE = /usr/include/$(PYTHON) | |
| c18a1a56 ER |
14 | --- ./anaconda~ 2006-05-18 23:34:39.000000000 +0300 |
| 15 | +++ ./anaconda 2006-05-18 23:48:57.000000000 +0300 | |
| 95f1cd3c ER |
16 | @@ -275,12 +275,7 @@ |
| 17 | ||
| 18 | # handle updates of just a single file in a python package | |
| 19 | def setupPythonUpdates(): | |
| 20 | - import glob | |
| 21 | - | |
| 22 | - # get the python version. first of /usr/lib/python*, strip off the | |
| 23 | - # first 15 chars | |
| 24 | - pyvers = glob.glob("/usr/lib/python*") | |
| 25 | - pyver = pyvers[0][15:] | |
| 26 | + pyver = sys.version[:3] | |
| 27 | ||
| 28 | try: | |
| 29 | os.mkdir("/tmp/updates") | |
| 30 | @@ -289,12 +284,7 @@ | |
| 31 | ||
| 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), | |
| 36 | - os.X_OK): | |
| 37 | - libdir = "lib64" | |
| 38 | - else: | |
| 39 | - libdir = "lib" | |
| 40 | + libdir = sys.lib | |
| 41 | ||
| 42 | if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK): | |
| 43 | try: | |
| c18a1a56 | 44 | @@ -330,15 +320,15 @@ |
| 95f1cd3c ER |
45 | sys.path.append('textw') |
| 46 | sys.path.append('iw') | |
| 47 | else: | |
| 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) | |
| 54 | ||
| 55 | if (os.path.exists('booty')): | |
| 56 | sys.path.append('booty') | |
| c18a1a56 ER |
57 | sys.path.append('booty/edd') |
| 58 | else: | |
| 59 | - sys.path.append('/usr/lib/booty') | |
| 60 | + sys.path.append('/usr/%s/booty' % sys.lib) | |
| 61 | ||
| 62 | sys.path.append('/usr/share/system-config-keyboard') | |
| 63 | sys.path.append('/usr/share/system-config-date') |