diff options
| author | Trent Nelson <trent@trent.me> | 2012-10-17 04:32:49 -0400 |
|---|---|---|
| committer | Trent Nelson <trent@trent.me> | 2012-10-17 04:32:49 -0400 |
| commit | abf205149cbbfe8c23c0034b13afdc165b82ffc0 (patch) | |
| tree | 5898436629d86bcfb98a98deb659e07a7f204061 | |
| parent | eadca1defab2966714ece5b2218c98e9ee9e4394 (diff) | |
| download | cpython-git-abf205149cbbfe8c23c0034b13afdc165b82ffc0.tar.gz | |
Issue #15819: use standard autoconf preset output variables.
Reported by: Roumen Petrov
| -rw-r--r-- | Makefile.pre.in | 3 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 91b2b5aebf..b6578dec08 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -27,7 +27,8 @@ MODLIBS= _MODLIBS_ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ -BUILDDIR= @BUILDDIR@ +abs_srcdir= @abs_srcdir@ +abs_builddir= @abs_builddir@ CC= @CC@ CXX= @CXX@ @@ -649,7 +649,6 @@ HGBRANCH HGTAG HGVERSION BASECPPFLAGS -BUILDDIR SVNVERSION ARFLAGS AR @@ -5177,10 +5176,8 @@ else SVNVERSION="echo Unversioned directory" fi -BUILDDIR="`pwd`" - -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then +if test "$abs_srcdir" != "$abs_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 index 6f8ed747e9..7782116a1b 100644 --- a/configure.ac +++ b/configure.ac @@ -854,10 +854,8 @@ else SVNVERSION="echo Unversioned directory" fi -BUILDDIR="`pwd`" -AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then +if test "$abs_srcdir" != "$abs_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. |