Allow substitution of (Levi Stephen) and other construction variables used by various Tools.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index 5a74a40..3c5e5f5 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -38,17 +38,17 @@ import SCons.Util
 
 def jarSources(target, source, env, for_signature):
     """Only include sources that are not a manifest file."""
-    ret = []
+    jarchdir = env.subst('$JARCHDIR')
+    result = []
     for src in source:
         contents = src.get_contents()
         if contents[:16] != "Manifest-Version":
-            if env.has_key('JARCHDIR'):
+            if jarchdir:
                 # If we are changing the dir with -C, then sources should
                 # be relative to that directory.
-                ret.append(src.get_path(src.fs.Dir(env['JARCHDIR'])))
-            else:
-                ret.append(src)
-    return ret
+                src = src.get_path(src.fs.Dir(jarchdir))
+            result.append(src)
+    return result
 
 def jarManifest(target, source, env, for_signature):
     """Look in sources for a manifest file, if any."""