10 files changed, 14 insertions, 13 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 5a1fa7188..5f56f71dc 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -309,7 +309,7 @@ perl5_clean:
 PYTHON_FLAGS =
 
 # Make sure these locate your Python installation
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PYTHON_INCLUDE= $(DEFS) @PYINCLUDE@
   PYTHON_LIB    = @PYLIB@
   PYTHON        = @PYTHON@ $(PYTHON_FLAGS)
@@ -320,7 +320,7 @@ else
 endif
 
 # Extra Python specific linking options
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PYTHON_DLNK   = @PYTHONDYNAMICLINKING@
   PYTHON_LINK   = @PYLINK@
 else
@@ -330,7 +330,7 @@ endif
 PYTHON_SO     = @PYTHON_SO@
 
 # SWIG option for Python3
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   SWIGOPTPY3 =
 else
   SWIGOPTPY3 = -py3
diff --git a/Examples/python/import_packages/from_init1/Makefile b/Examples/python/import_packages/from_init1/Makefile
index 90c92ab1c..f08c3344b 100644
--- a/Examples/python/import_packages/from_init1/Makefile
+++ b/Examples/python/import_packages/from_init1/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../../..
 LIBS       =
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PKG1DIR  = "py2"
 else
   PKG1DIR  = "py3"
diff --git a/Examples/python/import_packages/from_init2/Makefile b/Examples/python/import_packages/from_init2/Makefile
index 90c92ab1c..f08c3344b 100644
--- a/Examples/python/import_packages/from_init2/Makefile
+++ b/Examples/python/import_packages/from_init2/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../../..
 LIBS       =
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PKG1DIR  = "py2"
 else
   PKG1DIR  = "py3"
diff --git a/Examples/python/import_packages/from_init3/Makefile b/Examples/python/import_packages/from_init3/Makefile
index 90c92ab1c..f08c3344b 100644
--- a/Examples/python/import_packages/from_init3/Makefile
+++ b/Examples/python/import_packages/from_init3/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../../..
 LIBS       =
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PKG1DIR  = "py2"
 else
   PKG1DIR  = "py3"
diff --git a/Examples/python/import_packages/relativeimport1/Makefile b/Examples/python/import_packages/relativeimport1/Makefile
index 90c92ab1c..f08c3344b 100644
--- a/Examples/python/import_packages/relativeimport1/Makefile
+++ b/Examples/python/import_packages/relativeimport1/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../../..
 LIBS       =
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PKG1DIR  = "py2"
 else
   PKG1DIR  = "py3"
diff --git a/Examples/python/import_packages/relativeimport2/Makefile b/Examples/python/import_packages/relativeimport2/Makefile
index 90c92ab1c..f08c3344b 100644
--- a/Examples/python/import_packages/relativeimport2/Makefile
+++ b/Examples/python/import_packages/relativeimport2/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../../..
 LIBS       =
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PKG1DIR  = "py2"
 else
   PKG1DIR  = "py3"
diff --git a/Examples/python/import_packages/relativeimport3/Makefile b/Examples/python/import_packages/relativeimport3/Makefile
index 90c92ab1c..f08c3344b 100644
--- a/Examples/python/import_packages/relativeimport3/Makefile
+++ b/Examples/python/import_packages/relativeimport3/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../../..
 LIBS       =
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PKG1DIR  = "py2"
 else
   PKG1DIR  = "py3"
diff --git a/Examples/python/index.html b/Examples/python/index.html
index 750c0f04a..17d45fb7b 100644
--- a/Examples/python/index.html
+++ b/Examples/python/index.html
@@ -88,7 +88,7 @@ to look at the <a href="http://www.python.org/sigs/distutils-sig/">distutils</a>
 
 <h2>Compatibility</h2>
 
-For Python 3, set the environment variable <tt>PY3=1</tt>.
+For Python 2, set the environment variable <tt>PY2=1</tt>.
 
 <p>
 Your mileage may vary.  If you experience a problem, please let us know by 
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index 80116be13..cc6adeb69 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -2,7 +2,7 @@
 # Makefile for python test-suite
 #######################################################################
 
-ifeq (,$(PY3))
+ifneq (,$(PY2))
   PYBIN = @PYTHON@
 else
   PYBIN = @PYTHON3@
diff --git a/Examples/test-suite/python/README b/Examples/test-suite/python/README
index 84992ed05..402724c23 100644
--- a/Examples/test-suite/python/README
+++ b/Examples/test-suite/python/README
@@ -4,5 +4,6 @@ Any testcases which have _runme.py appended after the testcase name will be dete
 
 The _runme.py files needs to work for both Python 2.x and 3.x.
 
-You can run make with PY3=y to run test case with Python 3.x, eg.
-  $ make voidtest.cpptest PY3=y
+By default testcases are run with Python 3.  You can run make with PY2=1 to run test case with Python 2, eg.
+
+  $ make voidtest.cpptest PY2=1