Refactor the interface between Rsearch() and Rsearchall() and their supplied functions' arguments to keep the repository and dir path portions separate.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index f388b63..f871551 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -79,7 +79,10 @@ def scan(node, env, target, fs = SCons.Node.FS.default_fs):
     # node.includes - the result of include_re.findall()
 
     if not hasattr(target, 'cpppath'):
-        def Dir(x, dir=target.cwd, fs=fs): return fs.Dir(x,dir)
+        def Dir(rep, path, dir=target.cwd, fs=fs):
+            if rep:
+                path = os.path.join(rep, path)
+            return fs.Dir(path, dir)
         try:
             target.cpppath = tuple(fs.Rsearchall(env['CPPPATH'], Dir))
         except KeyError:
diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py
index e87b885..954510a 100644
--- a/src/engine/SCons/Scanner/Fortran.py
+++ b/src/engine/SCons/Scanner/Fortran.py
@@ -77,7 +77,10 @@ def scan(node, env, target, fs = SCons.Node.FS.default_fs):
     # node.includes - the result of include_re.findall()
 
     if not hasattr(target, 'f77path'):
-        def Dir(x, dir=target.cwd, fs=fs): return fs.Dir(x,dir)
+        def Dir(rep, path, dir=target.cwd, fs=fs):
+            if rep:
+                path = os.path.join(rep, path)
+            return fs.Dir(path, dir)
         try:
             target.f77path = tuple(fs.Rsearchall(env['F77PATH'], Dir))
         except KeyError: