2 files changed, 9 insertions, 5 deletions
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py
index 9cac759..cfa6906 100644
--- a/test/Java/multi-step.py
+++ b/test/Java/multi-step.py
@@ -35,6 +35,7 @@ test = TestSCons.TestSCons()
 
 where_javac, java_version = test.java_where_javac()
 where_javah = test.java_where_javah()
+where_java_include=test.java_where_includes()
 
 swig = test.where_is('swig')
 if not swig:
@@ -64,6 +65,7 @@ test.subdir(['src'],
 test.write(['SConstruct'], """\
 import os,sys
 env=Environment(tools = ['default', 'javac', 'javah'],
+                CPPPATH=%(where_java_include)s,                 
                 JAVAC = r'%(where_javac)s',
                 JAVAH = r'%(where_javah)s')
 Export('env')
@@ -79,7 +81,7 @@ env.Append(SWIGFLAGS=['-c++','$_CPPINCFLAGS'])
 
 env.Append(CPPPATH='.')
 
-env.BuildDir('buildout', 'src', duplicate=0)
+env.VariantDir('buildout', 'src', duplicate=0)
 
 if sys.platform=='darwin':
    env.Append(CPPPATH=['/System/Library/Frameworks/JavaVM.framework/Headers'])
@@ -110,7 +112,7 @@ test.write(['src', 'HelloApplet', 'Hello.html'], """\
 test.write(['src', 'HelloApplet', 'SConscript'], """\
 import os
 Import ("env")
-denv=env.Copy()
+denv=env.Clone()
 classes=denv.Java(target='classes',source=['com'])
 #set correct path for jar
 denv['JARCHDIR']=os.path.join(denv.Dir('.').get_abspath(),'classes')
@@ -165,7 +167,7 @@ public class MyID
 
 test.write(['src', 'javah', 'SConscript'], """\
 Import('env')
-denv=env.Copy()
+denv=env.Clone()
 denv['JARCHDIR']=denv.Dir('.').get_abspath()
 denv.Jar('myid','MyID.java')
 denv.JavaH(denv.Dir('.').get_abspath(),'MyID.java')
@@ -362,7 +364,7 @@ private:
 
 test.write(['src', 'jni', 'SConscript'], """\
 Import ("env")
-denv=env.Copy()
+denv=env.Clone()
 
 denv.Append(SWIGFLAGS=['-java'])
 denv.SharedLibrary('scons',['JniWrapper.cc','Sample.i'])
diff --git a/test/Java/swig-dependencies.py b/test/Java/swig-dependencies.py
index 5477a2d..cc54180 100644
--- a/test/Java/swig-dependencies.py
+++ b/test/Java/swig-dependencies.py
@@ -42,6 +42,7 @@ if not swig:
 where_javac, java_version = test.java_where_javac()
 where_javah = test.java_where_javah()
 where_jar = test.java_where_jar()
+where_java_include=test.java_where_includes()
 
 test.subdir(['foo'],
             ['java'],
@@ -51,6 +52,7 @@ test.write(['SConstruct'], """\
 import os
 
 env = Environment(ENV = os.environ,
+                  CPPPATH=%(where_java_include)s,                 
                   JAVAC = r'%(where_javac)s',
                   JAVAH = r'%(where_javah)s')
 
@@ -92,7 +94,7 @@ import os
 Import('env')
 
 # unnecessary?
-env = env.Copy()
+env = env.Clone()
 
 env.Prepend(CPPPATH = ['#foo',])