diff options
| author | Trent Nelson <trent@trent.me> | 2012-10-17 08:45:30 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent@trent.me> | 2012-10-17 08:45:30 (GMT) |
| commit | 739fc541b197ed4dbb55be7a7d6925dc5f5ac5d8 (patch) | |
| tree | c076824aa97d47100f96efb90ffb4a42ba7c2777 | |
| parent | 3ed2cb5520fe1ad05664db41f7bac96438efc7d2 (diff) | |
| download | cpython-739fc541b197ed4dbb55be7a7d6925dc5f5ac5d8.zip cpython-739fc541b197ed4dbb55be7a7d6925dc5f5ac5d8.tar.gz cpython-739fc541b197ed4dbb55be7a7d6925dc5f5ac5d8.tar.bz2 | |
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 1b69655..91e28d2 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@ @@ -652,7 +652,6 @@ HGBRANCH HGTAG HGVERSION BASECPPFLAGS -BUILDDIR SVNVERSION ARFLAGS AR @@ -5207,10 +5206,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, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac index 116e03e..f2951a2 100644 --- a/configure.ac +++ b/configure.ac @@ -830,10 +830,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, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc |