diff options
| author | Steven Knight <knight@baldmt.com> | 2003-06-07 22:04:31 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-06-07 22:04:31 (GMT) |
| commit | 418471d33635bb87b062ee77c565bc80c20b151c (patch) | |
| tree | cd9f20892e13e3f4a237171dfcda708dd054fd20 /src/engine/SCons/Builder.py | |
| parent | 22ed0f721c935d4e5c3c7651d633c047bc98e19a (diff) | |
| download | SCons-418471d33635bb87b062ee77c565bc80c20b151c.zip SCons-418471d33635bb87b062ee77c565bc80c20b151c.tar.gz SCons-418471d33635bb87b062ee77c565bc80c20b151c.tar.bz2 | |
Handle library prefixes correctly if the subdirectory is named lib*. (Matt Balvin)
Diffstat (limited to 'src/engine/SCons/Builder.py')
| -rw-r--r-- | src/engine/SCons/Builder.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index 414c5de..6caf5d9 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -290,9 +290,10 @@ class BuilderBase: for f in files: if SCons.Util.is_String(f): - if pre and f[:len(pre)] != pre: + if pre: path, fn = os.path.split(os.path.normpath(f)) - f = os.path.join(path, pre + fn) + if fn[:len(pre)] != pre: + f = os.path.join(path, pre + fn) # Only append a suffix if the file does not have one. if suf and not SCons.Util.splitext(f)[1]: if f[-len(suf):] != suf: |