build.sh, build_matrix.sh: Use more the PREFIX variable

(cherry picked from commit fb8908c0ec90c025ea44fd298e9de2c96a7d859b)

diff --git a/build.sh b/build.sh
index 083559aa4e911e7c0d7c6d0ef24082b78a0d6e68..c237fe8395c9cd4e00f4d9692ccf166f421fcca6 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ SMB=${SMB:-no}
 # Install directory prefix
 PREFIX=/tmp/local
 # For TESTrun
 # Install directory prefix
 PREFIX=/tmp/local
 # For TESTrun

-export TCPDUMP_BIN=/tmp/local/bin/tcpdump
+export TCPDUMP_BIN=$PREFIX/bin/tcpdump

 
 travis_fold() {
     local action="$1"
 
 travis_fold() {
     local action="$1"

diff --git a/build_matrix.sh b/build_matrix.sh
index 1e610a9b50e328666cb7b369429e4892b0284e90..fc3b77078ece3ed446bed6f199ac6830240e22ad 100755 (executable)
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -70,7 +70,7 @@ build_tcpdump() {
 choose_libpcap() {
     if [ "$BUILD_LIBPCAP" = no ]; then
         echo_magenta 'Use system libpcap'
 choose_libpcap() {
     if [ "$BUILD_LIBPCAP" = no ]; then
         echo_magenta 'Use system libpcap'

-        rm -rf /tmp/local
+        rm -rf $PREFIX

     else
         # Build libpcap with autoconf
         CMAKE_SAVE=$CMAKE
     else
         # Build libpcap with autoconf
         CMAKE_SAVE=$CMAKE