Merge JoinMarket-Org/joinmarket-clientserver#1272: Install Tor binaries under `/usr/local` for `--docker-install`

5e9044eb44 Install Tor binaries under /usr/local for --docker-install (Kristaps Kaupe)

Pull request description:

  Fixes #1271. See discussion there for details. Affects `--docker-install`.

Top commit has no ACKs.

Tree-SHA512: 77ede509d64e968fa2873ad41ecce47016d35f6efa1c87b7e22a4c6009b6eb9d4c8be85210920e0d5c5528a6faeddb4bb8059941ddaf48fe1502cdd683a521f4

install.sh

@@ -353,6 +353,13 @@ libsodium_install ()
 
 tor_build ()
 {
+    # jm_root will be empty for --docker-install,
+    # sys.prefix defaults to /usr/local
+    if [[ -n "$jm_root" ]]; then
+        tor_root="$jm_root"
+    else
+        tor_root="/usr/local"
+    fi
     $make uninstall
     $make distclean
     ./configure \
@@ -365,7 +372,7 @@ tor_build ()
         --disable-asciidoc \
         --disable-manpage \
         --disable-html-manual \
-        --prefix="${jm_root}"
+        --prefix="${tor_root}"
     $make
     if ! $make check; then
         return 1