diff options
| author | Trent Nelson <trent@trent.me> | 2012-10-17 08:49:26 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent@trent.me> | 2012-10-17 08:49:26 (GMT) |
| commit | 9a537a6abf3f93a66cfac77c214d99c691aaf848 (patch) | |
| tree | a02b6b469ee3cfd271e549ad74ecfa45dc4529b4 | |
| parent | b21099a4ca3bc680cc8e257cf8f2684412671275 (diff) | |
| parent | 5595ab564cd0a01b1efdba5a03b2521e393fe7a4 (diff) | |
| download | cpython-9a537a6abf3f93a66cfac77c214d99c691aaf848.zip cpython-9a537a6abf3f93a66cfac77c214d99c691aaf848.tar.gz cpython-9a537a6abf3f93a66cfac77c214d99c691aaf848.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 4ff801b..9c83248 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@ @@ -735,7 +735,6 @@ HGBRANCH HGTAG HGVERSION BASECPPFLAGS -BUILDDIR target_alias host_alias build_alias @@ -2747,10 +2746,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -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 bcf0387..535f3fe 100644 --- a/configure.ac +++ b/configure.ac @@ -9,10 +9,8 @@ AC_PREREQ(2.65) AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) -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 |