diff options
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 94ac0ee..2758474 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,15 +23,15 @@ run_versioned() { local V V=$(echo "$2" | sed -e 's,\.,,g') - - if [ -e "`which $1$V`" ] ; then - P="$1$V" + + if [ -e "`which $1$V 2> /dev/null`" ] ; then + P="$1$V" else - if [ -e "`which $1-$2`" ] ; then - P="$1-$2" - else - P="$1" - fi + if [ -e "`which $1-$2 2> /dev/null`" ] ; then + P="$1-$2" + else + P="$1" + fi fi shift 2 @@ -43,7 +43,7 @@ set -ex if [ "x$1" = "xam" ] ; then run_versioned automake "$VERSION" -a -c --foreign ./config.status -else +else rm -rf autom4te.cache rm -f config.cache @@ -52,7 +52,8 @@ else run_versioned autoheader 2.59 run_versioned automake "$VERSION" -a -c --foreign - CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@" - - make clean + if test "x$NOCONFIGURE" = "x"; then + CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@" + make clean + fi fi |