diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-06-11 08:31:17 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-06-11 08:31:17 (GMT) |
| commit | abcc3f4357529de91109fa52cd2fff67b13a44b0 (patch) | |
| tree | 40efadbc2d3a521c0dba9817a3965ccf8e227546 /Lib/distutils/sysconfig.py | |
| parent | 015c8103b1447f3914106de1522fa16ee5ed04b6 (diff) | |
| download | cpython-abcc3f4357529de91109fa52cd2fff67b13a44b0.zip cpython-abcc3f4357529de91109fa52cd2fff67b13a44b0.tar.gz cpython-abcc3f4357529de91109fa52cd2fff67b13a44b0.tar.bz2 | |
Merged revisions 73341 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73341 | tarek.ziade | 2009-06-11 10:12:20 +0200 (Thu, 11 Jun 2009) | 1 line
Fixed #5201: now distutils.sysconfig.parse_makefile() understands '53264' in Makefiles
........
Diffstat (limited to 'Lib/distutils/sysconfig.py')
| -rw-r--r-- | Lib/distutils/sysconfig.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 223ff67..0fbd541 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -286,12 +286,19 @@ def parse_makefile(fn, g=None): if m: n, v = m.group(1, 2) v = v.strip() - if "$" in v: + # `$$' is a literal `$' in make + tmpv = v.replace('$$', '') + + if "$" in tmpv: notdone[n] = v else: - try: v = int(v) - except ValueError: pass - done[n] = v + try: + v = int(v) + except ValueError: + # insert literal `$' + done[n] = v.replace('$$', '$') + else: + done[n] = v # do variable interpolation here while notdone: |