[Python-checkins] cpython (2.7): Issue #15819: tweak logic in previous commit (e0a2b14a3cf9).

trent.nelson python-checkins at python.org
Tue Oct 16 17:11:26 CEST 2012


http://hg.python.org/cpython/rev/c35db4960d1c
changeset:   79758:c35db4960d1c
branch:      2.7
parent:      79755:e0a2b14a3cf9
user:        Trent Nelson <trent at trent.me>
date:        Tue Oct 16 10:52:35 2012 -0400
summary:
  Issue #15819: tweak logic in previous commit (e0a2b14a3cf9).

files:
  configure    |  2 +-
  configure.ac |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5180,7 +5180,7 @@
 BUILDDIR="`pwd`"
 
 
-if test "$srcdir" != "$BUILDDIR"; then
+if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
     # If we're building out-of-tree make sure Include (in the current dir)
     # gets picked up before its $srcdir counterpart in order for Python-ast.h
     # and graminit.h to get picked up from the correct directory.
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -857,7 +857,7 @@
 BUILDDIR="`pwd`"
 AC_SUBST(BUILDDIR)
 AC_SUBST(BASECPPFLAGS)
-if test "$srcdir" != "$BUILDDIR"; then
+if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
     # If we're building out-of-tree make sure Include (in the current dir)
     # gets picked up before its $srcdir counterpart in order for Python-ast.h
     # and graminit.h to get picked up from the correct directory.

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list