[tor-commits] [tor/master] Define SRCDIR more correctly in configure.ac

[nickm@xxxxxxxxxxxxxx]

commit 398bef2592010e71692dd9c3b5b90d3751c48bb2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 23 12:38:27 2018 -0400

    Define SRCDIR more correctly in configure.ac
    
    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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6fadc21df..d7cc05c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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")

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits