From 2a8feeba76bbafa47dd46aea6de3aca40e2b8804 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 19:27:24 +0200 Subject: [PATCH] sb16_csp/gitcompile improve automake directory detection Signed-off-by: Jaroslav Kysela --- sb16_csp/gitcompile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sb16_csp/gitcompile b/sb16_csp/gitcompile index 2089bd4..0f42e99 100755 --- a/sb16_csp/gitcompile +++ b/sb16_csp/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if -z "$GITCOMPILE_NO_MAKE"; then make || exit 1 fi -- 2.47.1