travis tuning

diff --git a/ci/build-1-autotools.sh b/ci/build-1-autotools.sh
index 2e7631e1683735afa727995c90f6ef7e0cabb998..a8f142aec8f706ad5a39f3b1fae12acfb368f56f 100755 (executable)
--- a/ci/build-1-autotools.sh
+++ b/ci/build-1-autotools.sh
@@ -1,11 +1,10 @@
-#!/bin/bash
+#!/bin/bash -e
 
 AUTOCONF=http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 AUTOMAKE=http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz
 LIBTOOL=http://alpha.gnu.org/gnu/libtool/libtool-2.4.2.418.tar.gz
-PREFIX=$(pwd)/build
-
-set -e
+PREFIX=$(pwd)/ci/build
+PATH=$(pwd)/ci/build/bin:$PATH
 
 if [ ! -d ci ]; then
     echo "you must run this in the root fping directory" >&2

diff --git a/ci/build-2-install.sh b/ci/build-2-install.sh
index 6a511eee953bc5ff32e6e21478d2f4ec6aaab055..bdf2cdef457d5d4379a89a30243ab3ce8946f38b 100755 (executable)
--- a/ci/build-2-install.sh
+++ b/ci/build-2-install.sh
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/bash -e
+
+PATH=$(pwd)/ci/build/bin:$PATH
 
 if [ ! -d ci ]; then
     echo "you must run this in the root fping directory" >&2
     exit 1
 fi
 
-PATH=$(pwd)/ci/build/bin:$PATH
-
 autoreconf -i
 ./configure --enable-ipv4 --enable-ipv6 --prefix=/opt/fping
 make