summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Node/FS.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-04-29 15:55:11 (GMT)
committerSteven Knight <knight@baldmt.com>2002-04-29 15:55:11 (GMT)
commitba9fa12fcc465eb09debdcbd4ccf1ca2d5e8a56e (patch)
treeeec88ba5f3564890bd9537e5c8a25e4ac9e26dc7 /src/engine/SCons/Node/FS.py
parentd8a61ce7bec032b17a03dbcb1f5cdaaa1e40e2f6 (diff)
downloadSCons-ba9fa12fcc465eb09debdcbd4ccf1ca2d5e8a56e.zip
SCons-ba9fa12fcc465eb09debdcbd4ccf1ca2d5e8a56e.tar.gz
SCons-ba9fa12fcc465eb09debdcbd4ccf1ca2d5e8a56e.tar.bz2
Fix for CPPPATH='#'. (Charles Crain)
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
-rw-r--r--src/engine/SCons/Node/FS.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index d629d40..6ccd146 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -227,10 +227,12 @@ class FS:
if name[0] == '#':
directory = self.Top
name = os.path.normpath(name[1:])
- if name[0] == os.sep:
+ if name and (name[0] == os.sep or \
+ name[0] == '/'):
# Correct such that '#/foo' is equivalent
# to '#foo'.
name = name[1:]
+ name=os.path.join('.', name)
elif not directory:
directory = self._cwd
return (os.path.normpath(name), directory)