minor changes

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@41 07ea20a6-d2c5-0310-9e02-9ef735347d72

1 files changed, 16 insertions, 10 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index e63defb..4cdd30f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-# $Id: bootstrap.sh 3 2003-08-04 22:45:25Z lennart $
+#!/bin/bash
+# $Id$
 
 # This file is part of syrep.
 #
@@ -17,23 +17,29 @@
 # along with syrep; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+run_versioned() {
+    local P
+    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+
+    shift 2
+    "$P" "$@"
+}
+
 if [ "x$1" = "xam" ] ; then
     set -ex
-    automake -a -c
+    run_versioned automake 1.7 -a -c
     ./config.status
 else 
     set -ex
-
-    #make maintainer-clean || true
-
     rm -rf autom4te.cache
     rm -f config.cache
 
-    aclocal
+    run_versioned aclocal 1.7
     autoheader
-    automake -a -c
+    run_versioned automake 1.7 -a -c
     autoconf -Wall
 
-    ./configure "$@"
-fi
+    ./configure --sysconfdir=/etc "$@"
 
+    make clean
+fi