]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Define SRCDIR more correctly in configure.ac
authorNick Mathewson <nickm@torproject.org>
Fri, 23 Mar 2018 16:38:27 +0000 (12:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 23 Mar 2018 16:38:27 +0000 (12:38 -0400)
Without this fix, we were just getting SRCDIR=`pwd`, which naturally
was breaking out-of-tree builds.

Bugfix on becae4c943969a4f4f14423cc897d39f41af7773; bug not in any
released Tor.

configure.ac

index 6fadc21df4a09fe20cdf011e7bbe2145a804da26..d7cc05c098907d22665ed9d320ff71ff5e61cd9b 100644 (file)
@@ -1879,7 +1879,7 @@ AH_TEMPLATE([BUILDDIR],[tor's build directory])
 AC_DEFINE_UNQUOTED(BUILDDIR,"$BUILDDIR")
 
 if test "x$SRCDIR" = "x"; then
-  SRCDIR=`pwd`
+  SRCDIR=$(cd "$srcdir"; pwd)
 fi
 AH_TEMPLATE([SRCDIR],[tor's sourcedir directory])
 AC_DEFINE_UNQUOTED(SRCDIR,"$SRCDIR")