From: David Schweikert <david@schweikert.ch>
Date: Fri, 28 Feb 2014 22:04:04 +0000 (+0100)
Subject: travis tuning
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585142279828d2b5ffebeafc8072dc922963c0cc;p=fping.git

travis tuning
---

diff --git a/ci/build-1-autotools.sh b/ci/build-1-autotools.sh
index 2e7631e..a8f142a 100755
--- 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 6a511ee..bdf2cde 100755
--- 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