From 41199453499301255870e8290994d6468ee683a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dieb=20Martins?= Date: Mon, 22 Mar 2010 11:06:21 -0300 Subject: [PATCH] git-update.sh: use autogen.sh instead of autoregen.sh on fresh repositories. Fixes #613593. --- scripts/git-update.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/git-update.sh b/scripts/git-update.sh index 6bfae3459d..bb028d6ae3 100755 --- a/scripts/git-update.sh +++ b/scripts/git-update.sh @@ -63,7 +63,7 @@ build() { if test -d $1; then cd $1 - if test ! -e Makefile + if test ! -e Makefile -a -e autoregen.sh then echo "+ $1: autoregen.sh" ./autoregen.sh > "$tmp/$1-regen.log" 2>&1 @@ -75,6 +75,18 @@ build() fi echo "+ $1: autoregen.sh done" fi + else if test ! -e Makefile + then + echo "+ $1: autogen.sh" + ./autogen.sh > "$tmp/$1-gen.log" 2>&1 + if test $? -ne 0 + then + echo "$1: autogen.sh [$tmp/$1-gen.log]" >> $ERROR_LOG + cd .. + return $ERROR_RETURN + fi + echo "+ $1: autogen.sh done" + fi echo "+ $1: make" make > "$tmp/$1-make.log" 2>&1